tree a2f4f8069718c1f933e3b4e588bd88b6609de60c
parent 4068f6aff2f898c55e6f8f3e2c92eefbb9189524
parent 2739ed9628f72813d213b7a429c4c1b8dcebe5fc
author Colin Cross <ccross@android.com> 1391656068 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391656068 +0000

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

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