Brad Fitzpatrick 7f7ce40f90 resolved conflicts for merge of 28130bae to master ...

Change-Id: I13df8dc12092c3d2536e12216df9130d5914380a

2010-08-27 16:11:27 -07:00

..

config

…

java

resolved conflicts for merge of 28130bae to master

2010-08-27 16:11:27 -07:00

jni

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

2010-08-27 16:06:13 -07:00

res

Merge "Added default map boundaries for locale rm-CH. Cloned from values-de-rCH/arrays.xml."

2010-08-27 14:37:19 -07:00

tests

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

2010-08-27 15:52:33 -07:00