tree 8676aa4a471da11239baef3f07954ab6bf9911c6
parent 393d1e739fc10e526bd3b7b83836a266bfa24079
parent 06689dc53d14ab0449c64c097d2937179f986873
author Elliott Hughes <enh@google.com> 1438979392 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438979392 +0000

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

* commit '06689dc53d14ab0449c64c097d2937179f986873':
  Fix recovery image build.