tree 33d01daa6b3ca5d0b82dfa95011cd8ccb479c614
parent 8a02582f70a2cf30f74b322c7890f8de013e2334
parent 74b665fef1edb38ddc6e0a84c429ce0d5f3aee26
author Tao Bao <tbao@google.com> 1483487420 +0000
committer android-build-merger <android-build-merger@google.com> 1483487420 +0000

Merge "blockimgdiff.py: Clean up stash id computation in BBOTA v3+." am: 7cfc591596
am: 74b665fef1

Change-Id: I4d9b7eb0c73faee8c7044690750560840fa4d820