tree 7126c95728a6fec20fea3c80ba3a2a1a74a60b78
parent 965de2ce2b6e728da993f3d3e87c2b4d6d70ab13
parent 18aa041a62d36b9f2d4ead8ca0945ec87af582b4
author Dianne Hackborn <hackbod@google.com> 1339017763 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339017763 -0700

am 18aa041a: am 6cd19e02: Merge "Fix some divide by zero errors that could crash the system." into jb-dev

* commit '18aa041a62d36b9f2d4ead8ca0945ec87af582b4':
  Fix some divide by zero errors that could crash the system.