tree 2aa2cb6936c908494527967d2b865eaf6392b787
parent 5ee2e9289c25af571a240dd5ef26475c04b97bbe
parent 667fe67ba005172ad34ea711309df684f689c2b6
author Justin Ho <justinho@google.com> 1301526050 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1301526050 -0700

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

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