summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorMike LeBeau <mlebeau@android.com>2010-04-01 18:19:54 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-01 18:19:54 -0700
commit0ab0dc7285e0185dd5e5fbbb7ae52feaf37ca016 (patch)
treea02db8ec4f9529c70a90e48822c7a21f2ac18b25 /opengl/tests/gl_basic/gl_basic.cpp
parent53e5ab6ea0a7fed680560e8219340c5b6ff55d63 (diff)
parentfc8d8fafaf8202f0eef61614a18310b11019c29d (diff)
am 3079afaa: am af8c900a: Merge "Use flattenToShortString instead of toShortString on ComponentNames to be sent in RecognizerIntent.EXTRA_CALLING_PACKAGE. This never should have been using toShortString because that includes curly braces and is not correctly parsed by
Merge commit '3079afaaf549316483a0f30d22eb157656ca7951' into kraken * commit '3079afaaf549316483a0f30d22eb157656ca7951': Use flattenToShortString instead of toShortString on ComponentNames to
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions