tree 37ba0e25426452e995ac38307672a6d8714c6d27
parent f2004d373a81c223855267abb1ed97dcbd2e9731
parent f4cb32f44bddb873a63fe6df17baa102fa808b6e
author Marco Nelissen <marcone@google.com> 1476401733 +0000
committer android-build-merger <android-build-merger@google.com> 1476401733 +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: Id3f12e44b2958664a3bc4e2918d73e77ece3eb2f