diff options
| author | John Wang <johnwang@google.com> | 2010-04-21 14:46:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-21 14:46:06 -0700 |
| commit | bf82df79f78d0f4af92aabc90adbdc5c0a75d6a8 (patch) | |
| tree | 532df9facad6571445d85a65fb59ba0580ea5050 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c3e744227a19a45b8e7f292b1dadf373450fe417 (diff) | |
| parent | f9dc03312a73b7783586f8c2df44b9d6a7db9a30 (diff) | |
am 23c0b2eb: Merge "Add ILLEGAL_SIM_OR_ME error code." into froyo
Merge commit '23c0b2eb5a610030ad5afe406987cb09c858ccfb' into froyo-plus-aosp
* commit '23c0b2eb5a610030ad5afe406987cb09c858ccfb':
Add ILLEGAL_SIM_OR_ME error code.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions