summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorNick Pelly <npelly@google.com>2011-03-22 09:52:55 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-03-22 09:52:55 -0700
commit54b76288d40fa47a153ffbc799a3e404f623a998 (patch)
tree0634de38377d2847c6adc9ae88c550beef48ac7a /opengl/tests/gl_basic/gl_basic.cpp
parent3614b4772ed41bfdcbcc37613d2cedb205cf3bff (diff)
parent3e4bb011748fc8c49e10284d33ac1a3a06371f64 (diff)
Merge "NfcAdapterExtras: reset singleton state if initialization fails." into gingerbread
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions