tree 24e8b10084a897fc65edc140b09e9d19ed425f97
parent e60736c30964f99ae5eedace5ce46b964a0a26cc
parent a38f9d17c6a75174dd3cd83cbc9ad68da74ac439
author Marco Nelissen <marcone@google.com> 1476401897 +0000
committer android-build-merger <android-build-merger@google.com> 1476401897 +0000

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

Change-Id: I216f24273722e13cbb485005b8cf604b182f73f1