From: Tao Bao <tbao@google.com>
Date: Thu, 22 Oct 2015 18:15:05 +0000 (+0000)
Subject: Merge "blockimgdiff.py: Fix the script error for BBOTA v1." am: bcb9240a2b
X-Git-Tag: android-x86-7.1-r1~608^2~87
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ecffed1a4a66838178f93cd06b5b81450d937d08;p=android-x86%2Fbuild.git

Merge "blockimgdiff.py: Fix the script error for BBOTA v1." am: bcb9240a2b
am: 954024649e

* commit '954024649eaca7b257030846126329951e627ecd':
  blockimgdiff.py: Fix the script error for BBOTA v1.
---

ecffed1a4a66838178f93cd06b5b81450d937d08