Brad Fitzpatrick 96fd5af681 resolved conflicts for merge of 0b7b9807 to master ...

Change-Id: If60aeeb47cd06dcc76b88506688c7e4b58cf2208

2010-08-24 12:40:13 -07:00

..

config

…

java

resolved conflicts for merge of 0b7b9807 to master

2010-08-24 12:40:13 -07:00

jni

am 3a91abcb: am d3aaad0e: Merge "Use getMinFrameCount() instead of querying AudioSystem directly." into gingerbread

2010-08-23 12:01:18 -07:00

res

Added new Holo assets for Check boxes and Radio buttons.

2010-08-24 10:26:17 -07:00

tests

Merge "SQLiteOpenHelper should discard closed singleton database objects"

2010-08-24 10:08:13 -07:00