tree 1be839fa26f502419ff911b23446975ff39ad748
parent a38f9d17c6a75174dd3cd83cbc9ad68da74ac439
parent f4cb32f44bddb873a63fe6df17baa102fa808b6e
author Marco Nelissen <marcone@google.com> 1476401745 +0000
committer android-build-merger <android-build-merger@google.com> 1476401745 +0000

Merge "DO NOT MERGE Fix divide by zero" into mnc-dev am: ec206acb99 am: 69db172b16 am: a99878f636 am: 9c950265b8  -s ours
am: f4cb32f44b

Change-Id: If764a993b942b0d675a619c12ce89323e34cbc88