Irfan Sheriff ec348b4953 resolved conflicts for merge of 0a4b3fd9 to gingerbread-plus-aosp ...

Change-Id: I294e6e843ae028377d19c1180e0d5e9aef52897c

2011-02-02 14:23:10 -08:00

..

config

…

java

am dbf09fee: am eb17d6f5: Merge "Don\'t crash zygote if webcore fails to load"

2011-02-01 13:12:04 -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