Justin Ho 71ee3ba0f0 am f47a1683: Merge "Updated HTML5 media playback controls Bug: 4080127" into honeycomb-mr1 ...

* commit 'f47a16837cc0516e23811850f69839bb2f7ac95b':
  Updated HTML5 media playback controls Bug: 4080127

2011-03-14 18:25:45 -07:00

..

config

…

java

am ee7ace06: Merge "Fix rendering artifact in edge fades. Bug #4092053" into honeycomb-mr1

2011-03-14 18:18:03 -07:00

jni

Merge "Fix rendering artifact in edge fades. Bug #4092053" into honeycomb-mr1

2011-03-14 18:16:39 -07:00

res

am f47a1683: Merge "Updated HTML5 media playback controls Bug: 4080127" into honeycomb-mr1

2011-03-14 18:25:45 -07:00

tests

resolved conflicts for merge of 16cbe575 to honeycomb-mr1

2011-03-10 15:09:46 -08:00