tree 044e73f6c58364c7cd10986c4c4b6364011f6863
parent 8996f41189c63869fa3dbeef3823c15b246ae795
parent c3c3ae039adff5c1e2879d209f90e3fcf123d0e7
author Marco Nelissen <marcone@google.com> 1476401597 +0000
committer android-build-merger <android-build-merger@google.com> 1476401597 +0000

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

Change-Id: I9f0e3ffad9ba70f83f3da7879e005d5fc598bb6d