tree 45d3c11592c3bd562d411563d0f3c50fba164c75
parent 9b4268697f0254d21ae56d2b2a8fe190e3a43e79
parent db0bc7d46cacb6446deb7c59d39ce563846d7071
author Mathias Agopian <mathias@google.com> 1322595589 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322595589 -0800

am db0bc7d4: am 3f2730c5: Merge "temporarily hardcode Nexus S refresh rate" into ics-mr1

* commit 'db0bc7d46cacb6446deb7c59d39ce563846d7071':
  temporarily hardcode Nexus S refresh rate