tree b8497ded6aaf370feca2299360a4b12c867db928
parent 4030041e1d55eb4c0b1bc1ec84e205fd653aa5b9
parent 579a30dca29cfaf78b1315f8b439700001661bca
author Nicolas Roard <nicolasroard@google.com> 1300142377 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300142377 -0700

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)