summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJoe Onorato <joeo@google.com>2011-01-28 13:40:45 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-28 13:40:45 -0800
commitee37f4d4206097b61f5149b1538d4a1426c6b085 (patch)
treec108a35c18ab50b92de189158c0d5ee01cfdd6de /opengl/tests/gl_basic/gl_basic.cpp
parent311e33ddd1a4680cd81f41a879bf5a5757c19a76 (diff)
parent460529bb934a5f53bccc2d7c7a9dd8df3e2e464a (diff)
Merge changes Iaa7bc042,Icc312fc9,I50ba06ed into honeycomb
* changes: Make keyguard also ask to turn the back button off, now that it is controlled separately. Allow independent control of the back and the other navigation buttons. Allow the status bar disable flags to be used as View's system ui visibility fields.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions