OSDN Git Service

Merge "DO NOT MERGE Fix divide by zero" into klp-dev am: 2c28e5b126 am: a5477b11be...
authorMarco Nelissen <marcone@google.com>
Thu, 13 Oct 2016 23:38:30 +0000 (23:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Oct 2016 23:38:30 +0000 (23:38 +0000)
commit2f6c5b05f9b63f77bdaef79f27761df9a567af7c
tree70a89c5445e0b7a423eb38cd337f1bbfd246e60c
parenta49626e9f9a67d7640807cfe450d92c9cec9740a
parent8f8e719106425afd36fc93d4c9474a079e1ed958
Merge "DO NOT MERGE Fix divide by zero" into klp-dev am: 2c28e5b126 am: a5477b11be am: 913b7564c4  -s ours am: 391b2806b5  -s ours am: 172fa07944
am: 8f8e719106  -s ours

Change-Id: I18196452f6a19fe21fc4cad76c8df2165a044353