tree dedb02725659600503da6bb6bd46edae9fe450c4
parent 16b429914102227b0bc7d456c4edcbb3cccf083a
parent 731527f43fafdd0533153a37e54d28304c7e5d74
author Marco Nelissen <marcone@google.com> 1489447984 +0000
committer android-build-merger <android-build-merger@google.com> 1489447984 +0000

Merge "Fix integer overflow and divide-by-zero" into klp-dev am: b264ece2c0 am: bbca2719c6 am: c2e69851ea am: 3285770d37 am: d935c7f16e am: 98ee832c7e am: 1db2ee3dbd am: 946a690f5c am: 5fef11c61a am: 3a3cc883c1 am: d218b51912 am: 9305cf71d1 am: 7422dafea0
am: 731527f43f

Change-Id: I617276f7d81fc3e6d231522ff064aa96b4d5b4e6