tree 46fcde2521016d0406c12e203472c99f5b64c57d
parent a81d40ca9e1871ed7aa46ac331225cf4fcaaa874
parent 50ce790103e96440eb805a6945abc8f09ab54ff4
author Justin Ho <justinho@google.com> 1301528501 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1301528501 -0700

am 0b397314: am 0b251aec: am 01b13a11: Merge "Replacing browser playback controls for inactive videos Bug: 4136024" into honeycomb-mr1

* commit '0b3973143191962d3c4372523ed450f6a5bf0863':
  Replacing browser playback controls for inactive videos Bug: 4136024