tree 92e64d833257c421237c1812dde1cad870e97fbd
parent 425b08f14419a1e67a3d9d2c9b97ea61ecd4f5cb
parent 31f10bb21b24824c5dbf60b420239513f02b9e55
author Narayan Kamath <narayan@google.com> 1389886680 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389886680 +0000

am 31f10bb2: am 80b3dd0d: am 27a647bf: Merge "AArch64: Use long for pointers in android/os/MemoryFile"

* commit '31f10bb21b24824c5dbf60b420239513f02b9e55':
  AArch64: Use long for pointers in android/os/MemoryFile