tree 8f31bf5ce0da556dac47c82dc9a2249d20bbe139
parent 8f908ade58fd21d5bb27b7a42f8f07553c237df6
parent 48a27bcbb15774d0360fa344420a53cc72cd6708
author Tao Bao <tbao@google.com> 1436200849 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436200849 +0000

am 48a27bcb: Merge "Fix OTA scripts to generate incremental BBOTA with OEM property."

* commit '48a27bcbb15774d0360fa344420a53cc72cd6708':
  Fix OTA scripts to generate incremental BBOTA with OEM property.