commit | 34fa6d3891aceef6af910f114310cec17e13b372 | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Thu Aug 27 03:38:45 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 03:38:45 2015 +0000 |
tree | 69d6a47242f47951fc81617abee8d63d8b26de93 | |
parent | 371ab9058e923679e7dd451bc8351e6e0ce0c3b0 [diff] | |
parent | 8fa0007a3eb59174f7c2fbf40a2a972dfb344531 [diff] |
am 8fa0007a: (-s ours) am a9390df6: am 06689dc5: Merge "Fix recovery image build." * commit '8fa0007a3eb59174f7c2fbf40a2a972dfb344531':