tree c813ae76c74c92fa3467a0c6c6441e223b3a2a24
parent 652678af4d18b9a6c18ce6a860de01d958bc82fe
parent 9dd9e0c99dcb2db98ffbcf9ad97e58fab8d38640
author Craig Mautner <cmautner@google.com> 1354211834 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1354211835 -0800

Merge "Fix math errors causing black screen. DO NOT MERGE" into jb-mr1.1-dev