OSDN Git Service

Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev am: b6cf6d6a30
authorMarco Nelissen <marcone@google.com>
Sat, 15 Oct 2016 02:05:19 +0000 (02:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 15 Oct 2016 02:05:19 +0000 (02:05 +0000)
am: 4c31eb2675  -s ours

Change-Id: Ibc0f32ba1c4701f8c30f82b5b6c281ded3c628c7


Trivial merge