tree 41d6de6f36786959228c431388612b2846b3ceb6
parent 7daa48e62fa0ba002cffeddf8d520426a52d69a7
parent a9390df6c6b8d6cc98b102aeffc8e7acd300c857
author Elliott Hughes <enh@google.com> 1438982222 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438982222 +0000

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

* commit 'a9390df6c6b8d6cc98b102aeffc8e7acd300c857':
  Fix recovery image build.