OSDN Git Service

am ad1ff472: am 7bbc79fd: am 91f6aaaf: am 2d2d5943: am f3172c62: Merge "MediaDrm...
authorNarayan Kamath <narayan@google.com>
Thu, 19 Dec 2013 13:14:17 +0000 (13:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 19 Dec 2013 13:14:17 +0000 (13:14 +0000)
commit8907644bb6afbbabd31ac37f908ddcaa1a2a7e93
tree10093fea3aa094f2d5adcdff45dca42646c9f815
parent69d251383f3656a580c3878045de235d70a12000
parentad1ff47213e1b3a34a2b9e5a189742e9a15ed486
am ad1ff472: am 7bbc79fd: am 91f6aaaf: am 2d2d5943: am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int."

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