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)
commitdb358e20c6752f82a53d35c884ce58a923bd31b3
tree70a89c5445e0b7a423eb38cd337f1bbfd246e60c
parent9c6eda244c21f21ab5ca15586fa86bfc500fef40
parent4c31eb26758c7ecc364cd7449f0f739f1ff2f863
Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev am: b6cf6d6a30
am: 4c31eb2675  -s ours

Change-Id: Ibc0f32ba1c4701f8c30f82b5b6c281ded3c628c7