tree 3831bf6718a06719c3611f7b66f95d8eeb00ad92
parent 98da1357b47a48f324d5c1f404247f6ad965cf54
parent 7b9a92c1e2f59cdfbc051928edc8ec15b7833046
author Tianjie Xu <xunchang@google.com> 1519844704 +0000
committer android-build-merger <android-build-merger@google.com> 1519844704 +0000

Merge "Fix the behavior of undefined commands in BlockImageVerify" am: ac4818d6af
am: 7b9a92c1e2

Change-Id: I7891f4e907cc73618b99e2102eb8844771554b1f