Tom Taylor b1b5a1ab93 am aa0f5550: am 92010ff5: am dbac180d: Fix a merge problem with html mms ...

Merge commit 'aa0f5550cbfe713d5a08e25b734b6b976ca1a127'

* commit 'aa0f5550cbfe713d5a08e25b734b6b976ca1a127':
  Fix a merge problem with html mms

2010-07-21 11:29:39 -07:00

..

config

…

java

am aa0f5550: am 92010ff5: am dbac180d: Fix a merge problem with html mms

2010-07-21 11:29:39 -07:00

jni

am 34161132: am 7070b365: Added support for auxiliary audio effects to AudioTrack and MediaPlayer.

2010-07-21 09:52:17 -07:00

res

Add resource configuration flag to indicate whether USB host support exists.

2010-07-20 17:19:55 -04:00

tests

am d652751d: am b6761e73: am 28fe43be: Merge "Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test." into froyo

2010-07-16 16:25:27 -07:00