summaryrefslogtreecommitdiffstats
path: root/opengl/tests/linetex/linetex.cpp
diff options
context:
space:
mode:
authorCynthia Wong <cynthiaw@google.com>2009-11-09 14:14:55 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-09 14:14:55 -0800
commit7e6422c1cc9606e40332006e73542995070fb2cf (patch)
tree65adc74028828c1ce1b7e9517e3a6df481b81f09 /opengl/tests/linetex/linetex.cpp
parent6f240aec187e36b45eeed3fee11fbb2c3c461f24 (diff)
parent6720bb8314600a2b55a18159b4a22dc4b18aec88 (diff)
downloadframeworks_base-7e6422c1cc9606e40332006e73542995070fb2cf.zip
frameworks_base-7e6422c1cc9606e40332006e73542995070fb2cf.tar.gz
frameworks_base-7e6422c1cc9606e40332006e73542995070fb2cf.tar.bz2
am 6720bb83: am 26c91fa6: Merge change I4ff96000 into eclair-mr2
Merge commit '6720bb8314600a2b55a18159b4a22dc4b18aec88' * commit '6720bb8314600a2b55a18159b4a22dc4b18aec88': new gservices flag for delaying bad gmail operations
Diffstat (limited to 'opengl/tests/linetex/linetex.cpp')
0 files changed, 0 insertions, 0 deletions