tree 94c9301be60df1239c531062454151ea68037f62
parent 31acb6ef3a1d0d324a96094ef0568ce112a20e64
parent fc06862afb375be57881831ae7fc256dfa215bc6
author Sen Jiang <senj@google.com> 1487280408 +0000
committer android-build-merger <android-build-merger@google.com> 1487280408 +0000

Merge changes from topic 'use_bspatch_from_external/bsdiff' am: 218dfb0239 am: ebd32bf165
am: fc06862afb

Change-Id: I71a757916772a332a06620ff8d80b1a235195f4d