summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJoe Onorato <joeo@google.com>2010-10-31 11:41:47 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-10-31 11:41:47 -0700
commitb620238a42a7bb0231c99e8c49dd98bffd982f27 (patch)
tree8a9930838884b02f3668b4d7bed205bc91d6f846 /opengl/tests/gl_basic/gl_basic.cpp
parentdbd9bf6592526422f16c4a343eda6cf2df744003 (diff)
parentc16e2bd6e6d5ef99c513e79736f513e73f72d0be (diff)
Merge "Allow both contentIntent and setOnClickPendingIntent in notifications"
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions