summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorKenny Root <kroot@android.com>2011-02-07 13:49:08 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-02-07 13:49:08 -0800
commit7679365b54b2f34ad1bc75fba554847865965868 (patch)
tree2d8b86799460ec9abf66f7a35602c1f16e3362a9 /opengl/tests/gl_basic/gl_basic.cpp
parent7d7972188807ad448beed4ccac7d73f7f59591e2 (diff)
parent6465889ecbf4c04bb4bb6f4e8d4306727f7ca837 (diff)
am 6465889e: am c4dfa998: am d2a99617: am c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings."
* commit '6465889ecbf4c04bb4bb6f4e8d4306727f7ca837': JPtextinput: Dont break emoji characters when cutting strings.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions