tree adb2fa44cb7dc2f9de870525207719d380581abb
parent de95a276e7caf3b9918c21a4f43f91c7c25b3a6b
parent 4317b3418b144c162634ec647df76a484ac35612
author Craig Mautner <cmautner@google.com> 1354228063 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354228063 -0800

am 4317b341: am 24d966a3: Merge "Fix math errors causing black screen. DO NOT MERGE" into jb-mr1.1-dev

* commit '4317b3418b144c162634ec647df76a484ac35612':
  Fix math errors causing black screen. DO NOT MERGE