summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorNick Pelly <npelly@google.com>2011-07-11 11:07:22 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-07-11 11:07:22 -0700
commit407c94a147ac52dbd3747160748a219553bcbf2b (patch)
tree405af4697e1039904aa5431bde4cf5b22820379b /opengl/tests/gl_basic/gl_basic.cpp
parentc6818784e75173c7edde2fe0af7a50bd8bd86b20 (diff)
parent340f5a765bf7fba7f8fc363323e64fdef885ad7d (diff)
Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions