Diff - 2c28ae3933d4348655d7ba6d17ad33461aeabe26^2..2c28ae3933d4348655d7ba6d17ad33461aeabe26 - android_bootable_recovery

commit	2c28ae3933d4348655d7ba6d17ad33461aeabe26	[log] [tgz]
author	Tianjie Xu <xunchang@google.com>	Fri Oct 05 21:57:50 2018 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Fri Oct 05 21:57:50 2018 +0000
tree	22147f867876adb8d6fa57daafffdb3eb82ff8d6
parent	35332d7c6280c77570e5d975281e447761d6b39b [diff]
parent	62497b2c80b1d2d1ed2d0003046d5b4959fda3a8 [diff]

Merge changes from topic "am-88276146-0d74-467c-8b81-8d471d84ce66" into oc-dev

* changes:
  [automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: f39f139103 skipped: cce521e439 skipped: 4a53559e98
  [automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: f39f139103 skipped: cce521e439
  [automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: f39f139103
  DO NOT MERGE: Initialize the ZipArchive to zero before parsing