tree 83e3cac653338c84e2fe5c0f2c058ce252263afe
parent 2b8e48240e5439f40e133e9468d7bc9b0c5ade7c
parent 9a54dd3bf912894206e71f6b734cea4046917cad
author Tianjie Xu <xunchang@google.com> 1548804834 -0800
committer android-build-merger <android-build-merger@google.com> 1548804834 -0800

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

Change-Id: I0b19ace59a023380c2db175123f93205e3405aee