tree ce9ea3e38817086550bfec1344484fe9d5f20fee
parent 43f24b56035ba2ed742454aeb98b79686502bd5a
parent 90c63dbe3740af1e2278ea5ee7d1960b96447925
author Marco Nelissen <marcone@google.com> 1476402694 +0000
committer android-build-merger <android-build-merger@google.com> 1476402694 +0000

Merge "DO NOT MERGE Fix divide by zero" into mnc-dev am: ec206acb99 am: 69db172b16 am: a99878f636 am: 9c950265b8  -s ours am: f4cb32f44b am: bd52585dd1 am: 297bb1a1b7
am: 90c63dbe37

Change-Id: I025cd9acb45eb06159fc6c32baa7e4b47a01818b