tree 200ec2f71492e2ce4b14b9e1a0975420ec94bcef
parent 78d08ee44a6798c59f6b32adcfb3c260e167eba7
parent 0d22633e07a6911403383a22bb3164f53b4f4409
author Jeff Tinker <jtinker@google.com> 1426272216 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426272216 +0000

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

* commit '0d22633e07a6911403383a22bb3164f53b4f4409':
  Handle NULL keys and NULL values in MediaDrm JNI HashMap