diff options
| author | Mindy Pereira <mindyp@google.com> | 2010-10-19 18:23:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-19 18:23:18 -0700 |
| commit | 2758ba9e700b202d03648a2fe431ecbb2b6053f0 (patch) | |
| tree | 771ad51db849c171e622e52b5209cd779e827911 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 4777d13350d1958caf16c5c4f6e018d1c7c280ef (diff) | |
| parent | 512445175577b3e11f30c7fc4b8879067225b12e (diff) | |
am 6fbc5d9c: DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow.
Merge commit '6fbc5d9c19388e8f1c9a1833bc0e15fcf6b499f1' into gingerbread-plus-aosp
* commit '6fbc5d9c19388e8f1c9a1833bc0e15fcf6b499f1':
DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions