tree 37ba0e25426452e995ac38307672a6d8714c6d27
parent c240a2898d5128d0bc0d8651dd594ef64ab4b048
parent f4211ba53a849e87262c2388f42c0438ff8b1f52
author Marco Nelissen <marcone@google.com> 1476401718 +0000
committer android-build-merger <android-build-merger@google.com> 1476401718 +0000

DO NOT MERGE Fix divide by zero am: 2e211d38a3 am: 52e86acf03 am: 1607de251e am: c3c3ae039a  -s ours
am: f4211ba53a

Change-Id: I6749224c5f3796db13fa8b8835cacd5666af176c