tree fbfd54f24bb6e847d18f89e173d84ed148bcd5b8
parent edc96fdc44f4dffe8a8ffbab21e57e82f1582fd2
parent 640fc1d33895b9733e4f96b83a9eee29ac691f99
author Tianjie Xu <xunchang@google.com> 1489775671 +0000
committer android-build-merger <android-build-merger@google.com> 1489775671 +0000

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

Change-Id: If611a8023bb5411ac2a1063411d0030121ce0de2