tree 4c1ce950534a018a1c1d2241c3d147f06b105939
parent cadf4ed45137fbb776584b4427694eb783183d7e
parent 47bf5e68e6a745bef8b76e7f5eec0c6d483000bf
author Tao Bao <tbao@google.com> 1525739792 -0700
committer android-build-merger <android-build-merger@google.com> 1525739792 -0700

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

Change-Id: I2e555a2534bb0e14b520aa4c9036aaa7d73407c4