Jean-Baptiste Queru 39b58ba2b2 resolved conflicts for merge of bc2fb7b9 to jb-dev-plus-aosp ...

Change-Id: I5386585e473201268c6ed8b05e0a16569d434ea2

2012-05-01 09:54:38 -07:00

..

java

am ede38b5c: am 6a8186fb: Merge "Fixed group and child view caching in SimpleExpandableListAdapter."

2012-05-01 08:53:10 -07:00

jni

Merge "Surface: add JNI plumbing for setActiveRect." into jb-dev

2012-04-30 17:13:45 -07:00

res

Merge "Show ongoing ime switch icon on sw600" into jb-dev

2012-04-30 22:02:07 -07:00

tests

resolved conflicts for merge of bc2fb7b9 to jb-dev-plus-aosp

2012-05-01 09:54:38 -07:00