tree 087f4e227f938024c8e9390ed4eb418e44e0e92b
parent d6dc45c30c1704fca9ec33f51c7c4ec1bee515ea
parent 7d146197873e9bd5c1618a4ae10bcd13c821e1ce
author Marco Nelissen <marcone@google.com> 1280961595 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280961595 -0700

am 7d146197: Merge "Fix divide by zero." into gingerbread

Merge commit '7d146197873e9bd5c1618a4ae10bcd13c821e1ce' into gingerbread-plus-aosp

* commit '7d146197873e9bd5c1618a4ae10bcd13c821e1ce':
  Fix divide by zero.