OSDN Git Service

am 3bfc6e76: am c0d6028f: am a012fee3: am 5d6332e3: Merge "AArch64: Use long for...
authorElliott Hughes <enh@google.com>
Mon, 16 Dec 2013 23:27:39 +0000 (23:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 16 Dec 2013 23:27:39 +0000 (23:27 +0000)
commit36d10e79940fcb0c9ddd9780062065dc633971fb
tree1481d5df448f10c60ff369763404f43671fdb5e3
parentf1d58daa2f7a8e34a4aa0b4d8c9445a0a0004077
parent3bfc6e76e627d4122a774488f36fb843bb3694fb
am 3bfc6e76: am c0d6028f: am a012fee3: am 5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"

* commit '3bfc6e76e627d4122a774488f36fb843bb3694fb':
  AArch64: Use long for pointers in MediaDrm and MediaMuxer
media/java/android/media/MediaDrm.java