Jason Chen 22577b8d3a am 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread ...

* commit '5ff79c3b06d7087153617dc973491fc890700af5':
  DO NOT MERGE Cherry-pick of Ie4026a7c back to GB

2011-02-23 18:03:34 -08:00

..

config

…

java

am 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread

2011-02-23 18:03:34 -08:00

jni

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

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

res

am 99cca89f: Merge "Import revised translations. DO NOT MERGE" into gingerbread

2011-02-18 15:22:48 -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