OSDN Git Service

am 2d2d5943: am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int."
authorNarayan Kamath <narayan@google.com>
Thu, 19 Dec 2013 13:01:34 +0000 (05:01 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 19 Dec 2013 13:01:34 +0000 (05:01 -0800)
commit91f6aaaf2cb1c1a0cec129cec8038332de0271a8
tree0dc7f1ffdc31c9e7708869ac5e28678c6cfabbe9
parentd9386812169dd84a7f2bdd3a38a57b9c860525db
parent2d2d594308693af79bf5c44f0dcc30f29d2dc31a
am 2d2d5943: am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int."

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