tree 4c1ce950534a018a1c1d2241c3d147f06b105939
parent 6bdb289d7fda83c3342f56863de7a2a309735b19
parent 13784d1511ef4582c8cbe6ff2a00f936ca57d962
author Tao Bao <tbao@google.com> 1525740279 -0700
committer android-build-merger <android-build-merger@google.com> 1525740279 -0700

Merge "updater: Fix an issue when resuming an update." am: 1dc9e2ddef am: 47bf5e68e6
am: 13784d1511

Change-Id: I2bf115ee8c4a77c6097e6e52e0ec2ef9b5f73f72