diff options
author | Kenny Root <kroot@google.com> | 2009-12-14 16:32:08 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-14 16:32:08 -0800 |
commit | b092558fce89e9e43d861fb54142d4e3818cdf92 (patch) | |
tree | 6bf953b2264ce9bee701391b2fc869ba8fb8b0fa /opengl/tests/gl_basic/gl_basic.cpp | |
parent | 4c5a9631d837d81f64aeec7327f5bc6d9eb285df (diff) | |
parent | d884af6a8b9949f02200de4cee4e34de44db2f5f (diff) |
am 451c850f: am 15f1bfb0: Merge change I70d0bddb into eclair-mr2
Merge commit '451c850fd60aca5372810a5413636fda25d93438'
* commit '451c850fd60aca5372810a5413636fda25d93438':
Revise aapt options for UTF8/16 encoding
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions