tree 2b4eeb693fb86f40b3de67469242094c83e75690
parent 663fb7a09e48c77a7fff4f7a8488b08175170d6f
parent bb0a4f20502c27a920b7d874c9a17c178afee5f9
author Jason Sams <jsams@google.com> 1389402057 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389402057 +0000

am bb0a4f20: am 1ae17633: am 411350dd: am 739ae9b3: am 868173a5: Merge "Fix a JNI local reference leak in MediaDrm"

* commit 'bb0a4f20502c27a920b7d874c9a17c178afee5f9':
  Fix a JNI local reference leak in MediaDrm