tree 20feaea8760b2796110988d9aa9070fd1cdf40ab
parent c51ee6342afdfa21d5748560b2879d66cffbad14
parent 1e53256736c3ae0a2be1df8f28bb2d82f20d2f32
author Marco Nelissen <marcone@google.com> 1476486786 +0000
committer android-build-merger <android-build-merger@google.com> 1476486786 +0000

Merge "Fix divide by zero" into lmp-dev am: ef6934cdf9 am: cd1950301d am: 79a5c7031e am: d066317386 am: 5282b30565 am: 46b2338884 am: ecd361b12a am: bd52a5c4b7 am: 437775847d
am: 1e53256736

Change-Id: I6e144566803011e7f6d28da752c2ba78e36a5414