Nicolas Roard ac1aa45ed9 am 373ece1f: 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 '373ece1fa158d72152712b36674a9c114a40b649':
  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 16:36:50 -07:00

..

assets

Fix spacing issue

2011-02-10 11:33:35 -08:00

res

am 373ece1f: 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 16:36:50 -07:00

Android.mk

…

AndroidManifest.xml

resolved conflicts for merge of 38d0d562 to honeycomb-plus-aosp

2011-03-14 10:28:11 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…