tree b413372d709392ea10254ca9c3430ed4a97db3cd
parent 9e8dfb59380585a771620eee5e0732aef63daa11
parent b264ece2c02b97226a28df55dfe80ea0593421e3
author Marco Nelissen <marcone@google.com> 1489444494 +0000
committer android-build-merger <android-build-merger@google.com> 1489444494 +0000

Merge "Fix integer overflow and divide-by-zero" into klp-dev
am: b264ece2c0

Change-Id: Id65ef33cb965b6fbdec95d9429ee05b134fd14f3