tree b38f377bbb277045c1acf9dd4bce401dfe4a040e
parent 1c1497a7f6c07899feae0ae57a7e2003d60045ae
parent 0c9384d512cab94b761dcb82325e4411cbaf52c0
author Jesse Zhao <jessezhao@google.com> 1422488157 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422488157 +0000

am 0c9384d5: Merge "verify system and vendor image together before patching." into lmp-mr1-dev

* commit '0c9384d512cab94b761dcb82325e4411cbaf52c0':
  verify system and vendor image together before patching.