diff options
| author | Brett Chabot <brettchabot@android.com> | 2010-04-08 16:45:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-08 16:45:16 -0700 |
| commit | c99332653f4fe6379171ea03c69091f385899cc1 (patch) | |
| tree | 29bbf39e6ff004477b6949327165181486dffbd5 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 89aea511452af6a1572be27aefeafcab900b4dc6 (diff) | |
| parent | 5313fd997b1dbb49218486dbcce24500a7337e3b (diff) | |
am 133d0b70: am 185f1a96: Merge "IME test fixes." into froyo
Merge commit '133d0b70ff569dad9d996be49fdea10c2bdd4b97' into kraken
* commit '133d0b70ff569dad9d996be49fdea10c2bdd4b97':
IME test fixes.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions