Gilles Debunne 816dd3d443 resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp ...

Change-Id: I7f9c71eeb9fc5e01856f764930c6f168741cc9da

2011-03-14 12:57:01 -07:00

..

config

…

java

resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp

2011-03-14 12:57:01 -07:00

jni

am 4bdab175: DO NOT MERGE WiMAX support

2011-03-09 22:54:44 -08:00

res

am 367f41f8: Implement new NFC-EE API\'s as shared library (frameworks/base).

2011-03-10 16:32:28 -08:00

tests

am 7a7ed2b2: Merge "Do not check features in PackageManagerService DO NOT MERGE" into gingerbread

2011-01-31 17:55:11 -08:00