tree 99f8c8a688ef95b29aabdba032ec0b579a1752cb
parent e35d00d019aaff92b5e20b86d9c3b8222c0c946a
parent 5837f1025cf28935f3c6f3e0417dcfeac4d56688
author leozwang <leozwang@google.com> 1442279823 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442279823 +0000

am 5837f102: am 1753b4e9: resolved conflicts for 00fdede3 to lmp-mr1-ub-dev

* commit '5837f1025cf28935f3c6f3e0417dcfeac4d56688':
  Add an option to include a full bootloader in incremental OTA.