tree 5bb4f220e5cb213fafc7e195f015e4f7c69025c3
parent 1607de251e9ebe514ce3d5f2270516de3e116660
parent 69db172b16f3cbb3e2d902f4d453d68f1183e26a
author Marco Nelissen <marcone@google.com> 1476401310 +0000
committer android-build-merger <android-build-merger@google.com> 1476401310 +0000

Merge "DO NOT MERGE Fix divide by zero" into mnc-dev am: ec206acb99
am: 69db172b16

Change-Id: I18fc0116acb1a24dc1061333396333a8e3f6b70f