Scott Main dc28be1095 resolved conflicts for merge of 177b05d6 to master ...

Change-Id: I21072a31a28d0e0ea242d1d4f81e5f5f657e6364

2010-10-25 11:37:08 -07:00

..

config

…

java

resolved conflicts for merge of 177b05d6 to master

2010-10-25 11:37:08 -07:00

jni

am c2f78020: am 23656899: Merge "Fix issue #3126018: No way to specify NativeActivity\'s native method" into gingerbread

2010-10-24 18:42:12 -07:00

res

Merge "Fix ratingBarStyleSmall style in Holo theme."

2010-10-25 10:28:53 -07:00

tests

am 288f1373: am 8de43ab5: Merge "Change disable timeout for BT disable stress test" into gingerbread

2010-10-22 18:31:31 -07:00