Raphael ba068ce356 resolved conflicts for merge of 0aa38562 to master ...

Change-Id: I2e79f7c906477bc5d02352de6a7be17fffb4730a

2010-11-23 02:57:16 -08:00

..

res

Do not merge.

2010-10-21 12:46:04 -07:00

src/com/example/android/notepad

Do not merge.

2010-10-21 12:46:04 -07:00

tests

Samples: Fix bugs in Note Pad sample app.

2010-10-11 09:13:32 -07:00

_index.html

Revert "Revised Note Pad sample, new test app for Note Pad"

2010-08-09 17:18:13 -07:00

Android.mk

Update to follow clipboard APIs.

2010-08-27 11:06:05 -07:00

AndroidManifest.xml

resolved conflicts for merge of 0aa38562 to master

2010-11-23 02:57:16 -08:00