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

* commit 'f3172c623e4bb77a047262c6e7eedc4a2c2ea95a':
  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