tree b77b31ed1f7d83390da500b1f7615a89b9a65f37
parent 6b09a90a818137de52a0c7325339849ccf584b9e
parent 83366dfb96ad15e945a90270d329ce19dcf6b7e3
author Ben Murdoch <benm@google.com> 1287422803 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287422803 -0700

am 83366dfb: Merge "Add the HTML5Audio class, to support the audio tag." into gingerbread

Merge commit '83366dfb96ad15e945a90270d329ce19dcf6b7e3' into gingerbread-plus-aosp

* commit '83366dfb96ad15e945a90270d329ce19dcf6b7e3':
  Add the HTML5Audio class, to support the audio tag.