tree 30fbfeb62560c8503a6f8e32e9624c129f98c194
parent 45b0c84438afbb7beda94264a31e9f5c6faf0c89
parent 9c3d163b670d1720e542c23e8e6c8a4dd0d66a87
author Marco Nelissen <marcone@google.com> 1281033999 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281033999 -0700

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

Merge commit '533dc7866c19327e31ec6a13e36b997bcc74a650'

* commit '533dc7866c19327e31ec6a13e36b997bcc74a650':
  Fix divide by zero.