tree 57a697efd16afdfc6924f4255de13f07b1a72fee
parent 57c4fe1f33b1f043df8288326116ce778b84b7d0
parent 838f30a8f75c657d10f0ef9830ae3aace11e04d6
author Tao Bao <tbao@google.com> 1527812073 -0700
committer android-build-merger <android-build-merger@google.com> 1527812073 -0700

Merge "updater: Drop the 'blocks' parameter in LoadStash()." am: 0b80ba14d7
am: 838f30a8f7

Change-Id: I7eac9d3a708fc70c5dc8c73c4b7a05c861c37cc2