OSDN Git Service

am 1753b4e9: resolved conflicts for 00fdede3 to lmp-mr1-ub-dev
authorleozwang <leozwang@google.com>
Tue, 15 Sep 2015 01:07:05 +0000 (01:07 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 15 Sep 2015 01:07:05 +0000 (01:07 +0000)
* commit '1753b4e9e444d9ce57f5ce481ed5e3317670ee31':
  Add an option to include a full bootloader in incremental OTA.


Trivial merge