tree 044e73f6c58364c7cd10986c4c4b6364011f6863
parent a303b6108664266964bf64beea5e244cf4b49ece
parent d27738c9735d5cda5fddfd76c7293e2ec241190d
author Marco Nelissen <marcone@google.com> 1476498207 +0000
committer android-build-merger <android-build-merger@google.com> 1476498207 +0000

Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev am: b6cf6d6a30 am: 4c31eb2675  -s ours am: db358e20c6 am: d03ad9148a am: 92106db5fd
am: d27738c973  -s ours

Change-Id: I0ed92a012791cbc694eb99350149b40cc7d32564