OSDN Git Service

DO NOT MERGE Fix divide by zero am: febbd52cd9 am: 55ce7e5d1e
authorMarco Nelissen <marcone@google.com>
Thu, 13 Oct 2016 23:30:16 +0000 (23:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Oct 2016 23:30:16 +0000 (23:30 +0000)
am: 1b3f61ceaf  -s ours

Change-Id: Iaf8f9526bbb01eca75ded491f2dd43baabaee22e


Trivial merge