Brad Fitzpatrick 28130baefb resolved conflicts for merge of 6b50986a to gingerbread-plus-aosp ...

Change-Id: I7c5ec7ae717e75ad242e2c1ad4537052e4eea718

2010-08-27 12:08:40 -07:00

..

config

…

java

resolved conflicts for merge of 6b50986a to gingerbread-plus-aosp

2010-08-27 12:08:40 -07:00

jni

am b8fd0473: Merge "Fix for 512 limit in assetManager.list" into gingerbread

2010-08-27 10:34:47 -07:00

res

am 225ad9cb: Merge "DO NOT MERGE Text selection: tapping on selection opens context menu" into gingerbread

2010-08-27 10:34:56 -07:00

tests

am 8f5007ba: am 163fba0a: Merge "Improve logging and flexibility of BT stress tests." into froyo

2010-08-26 17:37:00 -07:00