tree 1785d0c88e2b69c46a79fb9f748f43d72c6604ed
parent 1b3f61ceaf06da408baf558e30bda0fd08435f40
parent a5477b11bee28f6e28b474b5e6343d8c2248dd1a
author Marco Nelissen <marcone@google.com> 1476401309 +0000
committer android-build-merger <android-build-merger@google.com> 1476401309 +0000

Merge "DO NOT MERGE Fix divide by zero" into klp-dev am: 2c28e5b126
am: a5477b11be

Change-Id: I23bc38094b99e0563a4aeeb7df08631212d0b73a