summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2011-05-14 07:50:40 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-14 07:50:40 -0700
commit2ed31d62b0c40736c59da54a898385fa16ce094e (patch)
tree5797ce3709bc320265cc9813cbf915f88d9c70d1 /opengl/tests/gl_basic/gl_basic.cpp
parent456fc72b8f3c831f1d4f6facb192db9227557417 (diff)
parentac0abc1a6159373b792bc89a3fb0e44613700fc5 (diff)
am d0903e14: am 6e41b32d: Merge "TelephonyRegistry remove 4 uses of FLAG_RECEIVER_REPLACE_PENDING." into honeycomb-LTE
* commit 'd0903e1478c7ba2fb8087f1bae1fba69791039ba': TelephonyRegistry remove 4 uses of FLAG_RECEIVER_REPLACE_PENDING.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions