tree d09a8d683cf713935e395168e403d1fbd61ea971
parent 679be487206a9f987b553fad081efb455bd28fcf
parent 4b6de1ba1ce0fff95c18a8abb7ba6e5762006d49
author Mark Salyzyn <salyzyn@google.com> 1394832941 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394832941 +0000

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

* commit '4b6de1ba1ce0fff95c18a8abb7ba6e5762006d49':
  Recovery 64-bit compile issues