diff options
| author | John Wang <johnwang@google.com> | 2010-04-21 14:51:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-21 14:51:43 -0700 |
| commit | 06b25c197ba1cba34ed556030cf74bf28dec8c61 (patch) | |
| tree | 05304c8d792772cbb98c0bd2b3283e1a3bf96553 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ef69d8b0c9ef205b0ca867ecf66e0e9a20cd187a (diff) | |
| parent | bf82df79f78d0f4af92aabc90adbdc5c0a75d6a8 (diff) | |
am f77fff4b: am 23c0b2eb: Merge "Add ILLEGAL_SIM_OR_ME error code." into froyo
Merge commit 'f77fff4b4e904486bf25affde713294d40764e15' into kraken
* commit 'f77fff4b4e904486bf25affde713294d40764e15':
Add ILLEGAL_SIM_OR_ME error code.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions