tree 938e5d23c80e29ae8f2919c95d8c301f3328d854
parent 390ae4c6607554440e7241047d1ca76476bd9586
parent 821592aff4f97120d5d59024d1312092ce138580
author Tianjie Xu <xunchang@google.com> 1489436987 +0000
committer android-build-merger <android-build-merger@google.com> 1489436987 +0000

Merge "Print SHA-1 in hex for corrupted blocks" am: 59383b383c
am: 821592aff4

Change-Id: I7555a81c640bee3c8bb165fe712d5d55cb94d6fe