Nicolas Roard 373ece1fa1 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 ...

* commit '65c282042dab1dfa75b10517190ba38834782c3b':
  Adding placeholders for the large play button used by the browser for HTML5 video (the button will appear surimposed to the video)

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

..

config

…

java

am b71020ef: Merge "b/3392594 keep the remain touch points when one is ended." into honeycomb-mr1

2011-03-14 14:46:27 -07:00

jni

Merge "Bug 3515073 Add ANativeWindow_fromSurfaceTexture" into honeycomb-mr1

2011-03-11 16:31:55 -08: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