tree abb79cf02481976a5a3e203dd9ea2b775f125e04
parent 870110e01af5c4875a9cf7134cee7c6842fd31af
parent 62632e25f57989d5e5ac406e21f037a3e2f39b9c
author Jeff Tinker <jtinker@google.com> 1426271732 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426271732 +0000

am 62632e25: Merge "Handle NULL keys and NULL values in MediaDrm JNI HashMap"

* commit '62632e25f57989d5e5ac406e21f037a3e2f39b9c':
  Handle NULL keys and NULL values in MediaDrm JNI HashMap