tree ffb64050202d1e3204ddcef82cfa71a430f6b9e6
parent 062a2cffb375fe87bc8e088122491c854bc6a0ee
parent fa62ae6d0b9d6dd21a31e3b207aafa61475ea063
author Tao Bao <tbao@google.com> 1479666247 +0000
committer android-build-merger <android-build-merger@google.com> 1479666247 +0000

Merge "Call update_engine_sideload from recovery." am: 1d77c93bcc
am: fa62ae6d0b

Change-Id: I516b0a177f66b6a3c1e51b2f470a29c8d2913780