tree 7bf113f43fb024ffb82d0aa31cd8553a6f2ff186
parent cac54eaba51bfad1d8bbd65001c3b23a2b928a88
parent 8876c2d4ab0d3051e58951dbca098b27841019b2
author Tianjie Xu <xunchang@google.com> 1557449133 -0700
committer android-build-merger <android-build-merger@google.com> 1557449133 -0700

Merge "Skip hashtree computation during block image verify" am: c046a61d97 am: e945763a5d
am: 8876c2d4ab

Change-Id: I3647cd9b5d6e15473778ce3ac7e8c525f8e58ebc