tree 564822f651406580d74a990d3d355dd212470f54
parent 4bc99bcd453559938d85b7f559b119d7dd46a9ba
parent 6fe7d5973c89e27652521e4d4af46deca557d2a3
author Marco Nelissen <marcone@google.com> 1486592795 +0000
committer android-build-merger <android-build-merger@google.com> 1486592795 +0000

Merge "Fix divide by zero" am: 659cb35e19 am: 021add2def
am: 6fe7d5973c

Change-Id: I05b15bf43fb31d9de3560ca1ccfe0c93f29fcf8f