tree 83e3cac653338c84e2fe5c0f2c058ce252263afe
parent 61130815a1c5b669120974e8b4db6a239825c22d
parent cc025b2b4a348b0460fab6b00eb7b1ce5cc9f661
author Tianjie Xu <xunchang@google.com> 1548805939 -0800
committer android-build-merger <android-build-merger@google.com> 1548805939 -0800

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

Change-Id: Iba39c6bd6e4e0b4e0576f7b82662439794b1d2fc