tree 57a697efd16afdfc6924f4255de13f07b1a72fee
parent b2865b044a73d87d46310a00e9cacbb19621760c
parent 8d6905d95250cc4ef38254d89fa72bb349fe72a1
author Tao Bao <tbao@google.com> 1527830779 -0700
committer android-build-merger <android-build-merger@google.com> 1527830779 -0700

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

Change-Id: Ie6073a4ea2b2cbba0f09334fbee27b546d4fcf51