tree bdd8221313613e4b514a17afa02f8fe7f567344d
parent 68e77434d8967baf7f1a5b79a61febcc60e6cb0a
parent a9390df6c6b8d6cc98b102aeffc8e7acd300c857
author Elliott Hughes <enh@google.com> 1438981985 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438981985 +0000

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

* commit 'a9390df6c6b8d6cc98b102aeffc8e7acd300c857':
  Fix recovery image build.