Jean-Baptiste Queru baaaca1c61 Merge ee4c17ee from gingerbread ...

Change-Id: Ide109e517fb7610d60f31ba6aa99fe665b59d690

2011-02-03 13:03:53 -08:00

..

config

…

java

Merge ee4c17ee from gingerbread

2011-02-03 13:03:53 -08:00

jni

am 61d9ffbf: Merge "Do not merge." into gingerbread

2011-01-13 12:06:38 -08:00

res

resolved conflicts for merge of 0a4b3fd9 to gingerbread-plus-aosp

2011-02-02 14:23:10 -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