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

* commit 'ee7ace065f77b53a57cb6273b9f2f5d85caba90c':
  Fix rendering artifact in edge fades. Bug #4092053

2011-03-14 18:18:03 -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 65c28204: Merge "Adding placeholders for the large play button used by the browser for HTML5 video (the button will appear surimposed to the video)" into honeycomb-mr1

2011-03-14 15:39:37 -07:00

tests

resolved conflicts for merge of 16cbe575 to honeycomb-mr1

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