tree dd1784479de805e1aa025fc2a13b1838b45b47f6
parent 26d00e87f997434e3106add31143ff19d1586f75
parent 5c06706d51affb5f3a641e074d08ece6274f4ffd
author Tianjie Xu <xunchang@google.com> 1489775460 +0000
committer android-build-merger <android-build-merger@google.com> 1489775460 +0000

Merge "Add a test to perform block_image_update" am: 881b08ecd2
am: 5c06706d51

Change-Id: I8d8961b0db84e7cedf12e0505d62f7321aace9ed