Nick Pelly d1c49d681c am a64e2ad4: resolved conflicts for merge of 38d0d562 to honeycomb-plus-aosp ...

* commit 'a64e2ad4da3612586594a19489a2b5d44f3f23a0':
  Implement new NFC-EE API's as shared library (frameworks/base).

2011-03-14 12:04:51 -07:00

..

assets

…

res

am ff25b975: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1

2011-03-10 14:47:57 -08:00

Android.mk

…

AndroidManifest.xml

resolved conflicts for merge of 38d0d562 to honeycomb-plus-aosp

2011-03-14 10:28:11 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…