Gilles Debunne 0d0dc6a70c am d9743af9: Merge "New assets. DO NOT MERGE>" into gingerbread ...

Merge commit 'd9743af92ead39b9f648043d165c415dfe8f3668' into gingerbread-plus-aosp

* commit 'd9743af92ead39b9f648043d165c415dfe8f3668':
  New assets. DO NOT MERGE>

2010-09-28 13:00:32 -07:00

..

config

…

java

am 5bdb89d7: Merge "Move DownloadManager to android.app (DO NOT MERGE)" into gingerbread

2010-09-28 12:41:42 -07:00

jni

am 52f58e96: Merge "fix problem in AudioEffect JNI setup." into gingerbread

2010-09-24 13:46:36 -07:00

res

am d9743af9: Merge "New assets. DO NOT MERGE>" into gingerbread

2010-09-28 13:00:32 -07:00

tests

am 5bdb89d7: Merge "Move DownloadManager to android.app (DO NOT MERGE)" into gingerbread

2010-09-28 12:41:42 -07:00