tree 4531013dc846bac91acdae211592c0e811cfef4e
parent d6e6303df49bc5455f008f4ad9ea6794a512e3dd
parent 026ebe0214d6c1c9b3ddc22c35e9ac37e5f622bc
author Mark Salyzyn <salyzyn@google.com> 1394830953 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394830953 +0000

am 026ebe02: Merge "Recovery 64-bit compile issues"

* commit '026ebe0214d6c1c9b3ddc22c35e9ac37e5f622bc':
  Recovery 64-bit compile issues