tree 69d6a47242f47951fc81617abee8d63d8b26de93
parent 371ab9058e923679e7dd451bc8351e6e0ce0c3b0
parent 8fa0007a3eb59174f7c2fbf40a2a972dfb344531
author Elliott Hughes <enh@google.com> 1440646725 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440646725 +0000

am 8fa0007a: (-s ours) am a9390df6: am 06689dc5: Merge "Fix recovery image build."

* commit '8fa0007a3eb59174f7c2fbf40a2a972dfb344531':