tree 2f50128b4a0bbee8186c109b1674b16e87a5737a
parent f32013a9078767d0fa8bc6b5816578db2c6bdc07
parent 19d80c34be7ddd3818839a10ef4df80fa7362841
author TreeHugger Robot <treehugger-gerrit@google.com> 1523488703 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1523488703 +0000

Merge changes from topic "am-bcb09242-ce3f-453e-a1ab-496ff9dcb274" into nyc-dev

* changes:
  [automerger] Add check preventing div0 issue am: 27e47ce3c3 am: 357017a262 am: fef8617324 am: a7d57f7a14
  [automerger] Add check preventing div0 issue am: 27e47ce3c3 am: 357017a262 am: fef8617324
  [automerger] Add check preventing div0 issue am: 27e47ce3c3 am: 357017a262
  [automerger] Add check preventing div0 issue am: 27e47ce3c3
  Add check preventing div0 issue