Adam Powell 815b1eb870 am 1c2911a6: Merge "Fix bug 3061769" into gingerbread ...

Merge commit '1c2911a648bdf5b2d8978ce96756ae82b7d452bd' into gingerbread-plus-aosp

* commit '1c2911a648bdf5b2d8978ce96756ae82b7d452bd':
  Fix bug 3061769

2010-10-04 19:59:35 -07:00

..

assets

http://b/issue?id=2516676

2010-03-25 14:19:06 +00:00

res

am 1c2911a6: Merge "Fix bug 3061769" into gingerbread

2010-10-04 19:59:35 -07:00

Android.mk

Do not use a user tag on apps, as it is ignored.

2010-01-06 08:53:44 -08:00

AndroidManifest.xml

NFC integration

2010-09-28 22:36:27 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…