tree bdd8221313613e4b514a17afa02f8fe7f567344d
parent 40dfee777c77212d0dda247ca9832801607bf5d3
parent 2496489cb4ec75f13b0d30f580332e74bf4a2fa8
author Elliott Hughes <enh@google.com> 1439002127 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439002127 +0000

am 2496489c: am a9390df6: am 06689dc5: Merge "Fix recovery image build."

* commit '2496489cb4ec75f13b0d30f580332e74bf4a2fa8':
  Fix recovery image build.