From: Tao Bao <tbao@google.com>
Date: Tue, 3 Jan 2017 23:50:20 +0000 (+0000)
Subject: Merge "blockimgdiff.py: Clean up stash id computation in BBOTA v3+." am: 7cfc591596
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=085daa6451;p=android-x86%2Fbuild.git

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

Change-Id: I4d9b7eb0c73faee8c7044690750560840fa4d820
---

085daa6451f6861bd5b873ecaa1f6d115aa00b08