tree 55b959b5826b77c8f512e408cae82ea2c955d88f
parent 69a4089f50ff97230731852dcf4b845ed6c60abf
parent 297bb1a1b75b041d9b7a84e664ebf49b3431babf
author Marco Nelissen <marcone@google.com> 1476402122 +0000
committer android-build-merger <android-build-merger@google.com> 1476402122 +0000

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

Change-Id: Ie4842fbbbea86478f2a6586305c2161a086ab62a