diff options
| author | Russell Brenner <russellbrenner@google.com> | 2011-05-25 21:27:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-25 21:27:41 -0700 |
| commit | 48567a8ad8fc667b75885d3ea6612d96b5db7a64 (patch) | |
| tree | 3f35a3c214429d18476e99d7bd0c04e957a67efd /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | cba23fa4cdd4ed5cd7641d802d61bb9ded66007e (diff) | |
| parent | 01faed6931eed33f987f6824650beb5e9a4f6b28 (diff) | |
am dd36e1bd: (-s ours) am 8b98284b: am 64796477: Merge "DO NOT MERGE-Refire the redraw event if webkit wasn\'t ready" into honeycomb-mr2
* commit 'dd36e1bde1e05cc9ece468693ea286536efad180':
DO NOT MERGE-Refire the redraw event if webkit wasn't ready
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions