tree 72c32d6f9585ebd3c7fa05ede7cb682dbede9915
parent dd200e9d2f7d6e8cb4a414f76fcacd166f7b8059
parent 8d12b4a0901df4ab708243b4cd36c19ac2002a50
author Christopher Ferris <cferris@google.com> 1390861421 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1390861421 +0000

am 8d12b4a0: am 4fe48966: am 57c9b95b: am 39baa829: Merge "Get arm64 to compile."

* commit '8d12b4a0901df4ab708243b4cd36c19ac2002a50':
  Get arm64 to compile.