tree 24e8b10084a897fc65edc140b09e9d19ed425f97
parent f3e1e8c0b1ee32768ee04b308756ef6ac878d8cf
parent 1d1fd4a403f3f857c306cd8f5ee333568590538d
author Marco Nelissen <marcone@google.com> 1476401308 +0000
committer android-build-merger <android-build-merger@google.com> 1476401308 +0000

Merge "Fix divide by zero" into nyc-dev am: 8996f41189
am: 1d1fd4a403

Change-Id: Ia520752e839996cd7ce8fe8b31a515b0a6419a96