tree ffb64050202d1e3204ddcef82cfa71a430f6b9e6
parent 953851cb97d70f0bfa6e967824d1ff3f104966b6
parent 4cbedcc67937615981e9668fb10942fe8c3162a3
author Tao Bao <tbao@google.com> 1479666547 +0000
committer android-build-merger <android-build-merger@google.com> 1479666547 +0000

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

Change-Id: I37af5d1ae1be07d6c1b233f5cf25896339db51cd