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:49:01 +0000 (23:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Oct 2016 23:49:01 +0000 (23:49 +0000)
commit45a89389ac6e6da51e79cfa6fc70f578a3df9023
tree044e73f6c58364c7cd10986c4c4b6364011f6863
parentb4f02ca0842a0b92925d115aec6306df6ea6d3d8
parent5a4695b5cb602e87c79109c44495b0c7b226a122
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 am: 2f6c5b05f9 am: 29da5c2eba am: 282551278b
am: 5a4695b5cb  -s ours

Change-Id: Iac7e9dbefba0a92486ed283db550edd1128272e8