tree 9583c9f67deea73d392e692331da2650a381dd38
parent ca127baa0675bc1168019fbb1f9812dbbe4613d7
parent 4e72e2bfc24afe053ca98c6de2591a4057cfd9fa
author James Dong <jdong@google.com> 1321417195 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321417195 -0800

am 4e72e2bf: am 4fdc36e6: Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1

* commit '4e72e2bfc24afe053ca98c6de2591a4057cfd9fa':
  Document that release() should be called with onPause() and onStop() for media objects