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:54:06 +0000 (23:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Oct 2016 23:54:06 +0000 (23:54 +0000)
am: 953b6b19eb

Change-Id: I7f24e3f01d2405cfa4178bfd91afa06068a5c6f1


Trivial merge