tree 8d2889e1ccade689a5f21236cb375f9a23734568
parent 531223a9f46370b25a41ec6b830cb1dd854e301f
parent 644cd4baf674de1f5dcbced2b18e3cbd6eb20042
author Nicolas Roard <nicolasroard@google.com> 1300145810 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300145810 -0700

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)