am 2d2d5943: am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int."
am 2d2d5943: am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int."

* commit '2d2d594308693af79bf5c44f0dcc30f29d2dc31a':
  MediaDrm#mNativeContext is a long, not int.

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