repo sync d5ba9c2223 Merge "resolved conflicts for merge of 17f95e92 to honeycomb-plus-aosp" into honeycomb-plus-aosp

2011-03-23 13:46:32 -07:00

..

config

…

java

Merge "resolved conflicts for merge of 17f95e92 to honeycomb-plus-aosp" into honeycomb-plus-aosp

2011-03-23 13:46:32 -07:00

jni

am afd1c014: Merge "SqliteDatabase: Fix local reference leak in custom_function_callback()" into honeycomb-mr1

2011-03-15 13:42:35 -07:00

res

am 3a2575f7: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1

2011-03-22 13:59:20 -07:00

tests

Clean up BT stress tests.

2011-03-18 20:13:11 -07:00