tree 22eabfe304c73e101dfc74d16f75234bf630fb1d
parent 117e4014c693d422150dffe86111a15aacd783f2
parent 84f4ad807152b6266431144425f153c48db28696
author Elliott Hughes <enh@google.com> 1384385213 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384385213 -0800

am 84f4ad80: am 87c5eeb4: Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify."

* commit '84f4ad807152b6266431144425f153c48db28696':
  Fix a JNI local reference leak in JNIMediaPlayerListener::notify.