tree 57e9e14b6e0510a9edf1fe471a4f767e61260102
parent 794b9818239abc41e19ee81fca9f1fb305c46acc
parent d8063b0af47ffa47db80375fb924832206b8aa40
author Tianjie Xu <xunchang@google.com> 1548806872 -0800
committer android-build-merger <android-build-merger@google.com> 1548806872 -0800

Merge "Fix potential size overflow in blockimg.cpp" am: 9a54dd3bf9 am: cc025b2b4a
am: d8063b0af4

Change-Id: I2c8fd5c1984f20157e8cbda07b476d0d6de458d7