tree 8fa1fa41069b4c6991157ac484069121caab9767
parent 239fb930e4d91de5d3a66997d32d43414055d40e
parent 026ebe0214d6c1c9b3ddc22c35e9ac37e5f622bc
author Mark Salyzyn <salyzyn@google.com> 1394830796 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394830796 +0000

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

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