tree f222c204e4c584c3a7a1f4f1c56fb936a1601f1a
parent 9af955744d4e0d82b61fc99a932b9a5cf28b5df7
parent 49b7ba4dbc0b4984fc466bb98e9cfa40650db85b
author Narayan Kamath <narayan@google.com> 1391182221 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1391182221 -0800

am 49b7ba4d: Merge "AArch64: Make AssetManager and related classes 64-bit compatible"

* commit '49b7ba4dbc0b4984fc466bb98e9cfa40650db85b':
  AArch64: Make AssetManager and related classes 64-bit compatible