diff options
| author | Mathias Agopian <mathias@google.com> | 2010-04-14 18:22:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-14 18:22:33 -0700 |
| commit | ee2d0608c86e063a08a0bf061e02980eef2c0370 (patch) | |
| tree | fcd455d88c532282c943e64fe131b47e7eae1600 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b955d510323a027338f0fb29583ec0847c625152 (diff) | |
| parent | 90e479389b5ecd92155363750b44e7f7e1a5dbf1 (diff) | |
am 45423465: Merge "fix [2594950] Flash: Zooming in on some content crashes the Nexus One and causes it to reboot (runtime restart)" into froyo
Merge commit '454234657cd9b0835ecd9c6704cbcd5369e926b1' into froyo-plus-aosp
* commit '454234657cd9b0835ecd9c6704cbcd5369e926b1':
fix [2594950] Flash: Zooming in on some content crashes the Nexus One and causes it to reboot (runtime restart)
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions