diff options
| author | Adam Powell <adamp@google.com> | 2010-09-01 14:01:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-01 14:01:44 -0700 |
| commit | 623a30d5b6746fda86e5efdd62865b50a33881fd (patch) | |
| tree | 5a438d33fa40180d101fc1ad648ae2e7d3acbe3c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 71e8b8313800f6abcfa42c5d023a7783361280a3 (diff) | |
| parent | f80fc12c88b512e30bf92b841b87205a48dbf931 (diff) | |
am e34fe69e: Merge "DO NOT MERGE Integrate edge effects into WebView." into gingerbread
Merge commit 'e34fe69e66d8c9bc76453347ba84261b060300f3' into gingerbread-plus-aosp
* commit 'e34fe69e66d8c9bc76453347ba84261b060300f3':
DO NOT MERGE Integrate edge effects into WebView.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions