tree 69d6a47242f47951fc81617abee8d63d8b26de93
parent a18e59d04623f238734e99ca05228bb52d32c3ee
parent 34fa6d3891aceef6af910f114310cec17e13b372
author Elliott Hughes <enh@google.com> 1440684834 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440684834 +0000

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

* commit '34fa6d3891aceef6af910f114310cec17e13b372':