tree 447fee2410642f9723e34f6eddf8e2d006a3f56b
parent fd84f65dcda3c7e4b42c71a7df85efebdbf7ea7a
parent a5d105e2397d81537facd93fd8a9d3e263d57dc9
author Colin Cross <ccross@android.com> 1391655578 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391655578 +0000

am a5d105e2: Merge "recovery: fix building with pointer-to-int errors turned on"

* commit 'a5d105e2397d81537facd93fd8a9d3e263d57dc9':
  recovery: fix building with pointer-to-int errors turned on