Jim Miller 3530ebe451 resolved conflicts for merge of 578e73da to honeycomb-plus-aosp ...

Change-Id: I334ae5382220a84881521885b6e3c3991fd8bbb0

2011-01-16 16:55:28 -08:00

..

config

…

java

resolved conflicts for merge of 578e73da to honeycomb-plus-aosp

2011-01-16 16:55:28 -08:00

jni

Merge "Cleanup implementation of hardware layers." into honeycomb

2011-01-13 12:13:59 -08:00

res

Fix 3339260: Remove emergency button from AccountUnlock screen

2011-01-16 15:20:19 -08:00

tests

am 312206b9: Merge "Add the {get,set}PackageObbPaths calls to API" into honeycomb

2011-01-14 12:44:39 -08:00