tree 2e6d4689d308a732ac03254543177f7514046712
parent a4f84447962ca2c7aa44da6cc903ffac48a80306
parent 3b409d56f4e142dd4afc7e11bbe4502123a46f31
author Tao Bao <tbao@google.com> 1439836172 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439836172 +0000

am 3b409d56: am dae6455c: Merge "Add an option to include a full bootloader in incremental OTA."

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