OSDN Git Service

am a0abf49d: resolved conflicts for a1fcaf86 to mnc-dr-dev
authorIan Pedowitz <ijpedowitz@google.com>
Wed, 16 Sep 2015 01:48:58 +0000 (01:48 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 16 Sep 2015 01:48:58 +0000 (01:48 +0000)
* commit 'a0abf49d2bdc42c81e5f636e54da9038de9dfc21':
  Add an option to include a full bootloader in incremental OTA.


Trivial merge