OSDN Git Service

am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int."
authorNarayan Kamath <narayan@google.com>
Thu, 19 Dec 2013 12:37:52 +0000 (04:37 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 19 Dec 2013 12:37:52 +0000 (04:37 -0800)
* commit 'f3172c623e4bb77a047262c6e7eedc4a2c2ea95a':
  MediaDrm#mNativeContext is a long, not int.


Trivial merge