am 868173a5: Merge "Fix a JNI local reference leak in MediaDrm"
am 868173a5: Merge "Fix a JNI local reference leak in MediaDrm"

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

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base