OSDN Git Service

am 7bbc79fd: am 91f6aaaf: am 2d2d5943: am f3172c62: Merge "MediaDrm#mNativeContext...
authorNarayan Kamath <narayan@google.com>
Thu, 19 Dec 2013 13:10:40 +0000 (13:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 19 Dec 2013 13:10:40 +0000 (13:10 +0000)
commitad1ff47213e1b3a34a2b9e5a189742e9a15ed486
tree38fd7fae7b7583a0dd82bff5387edd0feb00e567
parent67fa194ecb9e1d28ae3c60110bef671a3312b13b
parent7bbc79fd68ea358891ef7e7fa758c009491c4ea0
am 7bbc79fd: am 91f6aaaf: am 2d2d5943: am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int."

* commit '7bbc79fd68ea358891ef7e7fa758c009491c4ea0':
  MediaDrm#mNativeContext is a long, not int.