diff options
author | Kenny Root <kroot@google.com> | 2009-12-14 16:28:03 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-14 16:28:03 -0800 |
commit | d884af6a8b9949f02200de4cee4e34de44db2f5f (patch) | |
tree | 935174efb7ab3e6f273573cf96df95f2f7ebb9dc /opengl/tests/gl_basic/gl_basic.cpp | |
parent | a3c15ab7e394da8ff0ef3b671195583d32b4435d (diff) | |
parent | e6459adb7506a0e0f971f101b0f76aad1bd50461 (diff) |
am 15f1bfb0: Merge change I70d0bddb into eclair-mr2
Merge commit '15f1bfb0d29915ed1790b22a00fd7032f035ddb0' into eclair-mr2-plus-aosp
* commit '15f1bfb0d29915ed1790b22a00fd7032f035ddb0':
Revise aapt options for UTF8/16 encoding
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions