Brad Fitzpatrick bd80a12cba resolved conflicts for merge of 9240f16d to honeycomb-plus-aosp ...

Change-Id: I6e595bb11a5a692ccd730b9d1d2aa367063a61f5

2011-01-19 15:19:08 -08:00

..

config

…

java

resolved conflicts for merge of 9240f16d to honeycomb-plus-aosp

2011-01-19 15:19:08 -08:00

jni

Merge "Add a property for specifying a dalvik heap growth limit." into honeycomb

2011-01-19 14:40:24 -08:00

res

Updated the Time/Date pickers to be backwards compatible

2011-01-19 12:35:17 -08:00

tests

am f38bddbe: DO NOT MERGE Add connect HID/NAP BT stress test

2011-01-18 19:08:42 -08:00