tree 3793e71ccebc9d276c4206dc55a56d51487bd50e
parent 38638b2fcc4aba428889d521d83762d716e32332
parent 0cc4bb1ff30a7e2ef96837b1dbe79a89d5145dc2
author Narayan Kamath <narayan@google.com> 1390998220 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1390998220 +0000

am 0cc4bb1f: am e4fc5c17: am 74db9ddb: am 887b1ca8: Merge "AArch64: Use long for pointers in SurfaceTexture"

* commit '0cc4bb1ff30a7e2ef96837b1dbe79a89d5145dc2':
  AArch64: Use long for pointers in SurfaceTexture