| commit | 36d10e79940fcb0c9ddd9780062065dc633971fb | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Dec 16 23:27:39 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 16 23:27:39 2013 +0000 |
| tree | 1481d5df448f10c60ff369763404f43671fdb5e3 | |
| parent | f1d58daa2f7a8e34a4aa0b4d8c9445a0a0004077 [diff] | |
| parent | 3bfc6e76e627d4122a774488f36fb843bb3694fb [diff] |
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