OSDN Git Service

am fd5330c0: am 160603cf: am 5837f102: am 1753b4e9: resolved conflicts for 00fdede3...
authorleozwang <leozwang@google.com>
Tue, 15 Sep 2015 01:32:49 +0000 (01:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 15 Sep 2015 01:32:49 +0000 (01:32 +0000)
* commit 'fd5330c05716ef2bb697966dcde2886af331383d':
  Add an option to include a full bootloader in incremental OTA.


Trivial merge