diff options
| author | Adam Powell <adamp@google.com> | 2010-10-19 09:54:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-19 09:54:53 -0700 |
| commit | 5964e7e9b102b996789c583a3416d2ed38674aa8 (patch) | |
| tree | 01d1359a3be31beb124000693824974d0390b309 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 2ecd878609f06ae24748221cd024c92787acd3b1 (diff) | |
| parent | 64cedc1abe79935a10b52f43b15213323ebf1a18 (diff) | |
am 6018745f: (-s ours) am 9f85ef4a: Merge "DO NOT MERGE Fix bug 3107560 - Edge glow appears delayed in WebView" into gingerbread
Merge commit '6018745fb7d61f456f3fd96e79d03de28cd40a07'
* commit '6018745fb7d61f456f3fd96e79d03de28cd40a07':
DO NOT MERGE Fix bug 3107560 - Edge glow appears delayed in WebView
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions