Kenny Root 8db59adccf resolved conflicts for merge of b037da40 to master ...

Change-Id: I591f80f613870a4b1557f17d1c8574f661ed8121

2010-08-24 11:48:37 -07:00

..

config

…

java

resolved conflicts for merge of b037da40 to master

2010-08-24 11:48:37 -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