| commit | 3bfc6e76e627d4122a774488f36fb843bb3694fb | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Dec 16 21:07:24 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 16 21:07:24 2013 +0000 |
| tree | 2719d51383447c96a34d2bce63939f47de07240e | |
| parent | 409b7c98b47cb7ece2760aa53730233f54946e46 [diff] | |
| parent | c0d6028f58b0a55e4956b1bc34ac7e4a98b0f894 [diff] |
am c0d6028f: am a012fee3: am 5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer" * commit 'c0d6028f58b0a55e4956b1bc34ac7e4a98b0f894': AArch64: Use long for pointers in MediaDrm and MediaMuxer