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