tree 28f7db7c262f2ab024625d3075d624a53f398727
parent 4caa21fbcb8128ccb514e96520c3c22ce3a765b2
parent 437775847d4fd852fcb346e8aad955aad4c83d91
author Marco Nelissen <marcone@google.com> 1476486486 +0000
committer android-build-merger <android-build-merger@google.com> 1476486486 +0000

Merge "Fix divide by zero" into lmp-dev am: ef6934cdf9 am: cd1950301d am: 79a5c7031e am: d066317386 am: 5282b30565 am: 46b2338884 am: ecd361b12a am: bd52a5c4b7
am: 437775847d

Change-Id: Ib80f47bbd0ed9f1a2e4307c600836b64e7f8d522