| commit | 5837f1025cf28935f3c6f3e0417dcfeac4d56688 | [log] [tgz] |
|---|---|---|
| author | leozwang <leozwang@google.com> | Tue Sep 15 01:07:05 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 15 01:07:05 2015 +0000 |
| tree | 8b780a8d795a7385dbb3fc02afb0c61f20689b6f | |
| parent | 265d9aeb622c5829787b16b903f028cacaa99c18 [diff] | |
| parent | 1753b4e9e444d9ce57f5ce481ed5e3317670ee31 [diff] |
am 1753b4e9: resolved conflicts for 00fdede3 to lmp-mr1-ub-dev * commit '1753b4e9e444d9ce57f5ce481ed5e3317670ee31': Add an option to include a full bootloader in incremental OTA.