Jean-Baptiste Queru 46089bd1cb am 02623128: resolved conflicts for merge of 1ffd753e to gingerbread-plus-aosp ...

Merge commit '026231284c44ca8cf789e0d5045c5ae6a91d7766'

* commit '026231284c44ca8cf789e0d5045c5ae6a91d7766':
  Crash when powering off.

2010-08-24 11:22:05 -07:00

..

config

…

java

am 02623128: resolved conflicts for merge of 1ffd753e to gingerbread-plus-aosp

2010-08-24 11:22:05 -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