Kenny Root 53e75ea847 resolved conflicts for merge of 485de781 to master ...

Change-Id: I483cb81596f09b024b1aea7fc55960183f38b24f

2010-08-24 09:57:33 -07:00

..

config

…

java

resolved conflicts for merge of 485de781 to master

2010-08-24 09:57:33 -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

Make Theme.Holo the default theme for new apps.

2010-08-23 18:51:26 -07:00

tests

am 005f0d08: am 4d42ccd1: Tracking merge of dalvik-dev to gingerbread

2010-08-24 09:03:29 -07:00