Irfan Sheriff aec39e625b Merge "resolved conflicts for merge of ec348b49 to honeycomb-plus-aosp" into honeycomb-plus-aosp

2011-02-02 16:03:29 -08:00

..

config

…

java

am 8257e4d7: Merge "DO NOT MERGE. Only scroll if the IME is open in certain cases." into honeycomb

2011-02-02 15:52:00 -08:00

jni

Catch exception when ViewRoot's surface is not valid.

2011-01-27 15:36:40 -08:00

res

resolved conflicts for merge of ec348b49 to honeycomb-plus-aosp

2011-02-02 16:02:37 -08:00

tests

am 6cf32312: Merge "Do not check features in PackageManagerService" into honeycomb

2011-01-31 18:51:56 -08:00