summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-09-28 13:58:12 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-28 13:58:12 -0700
commitdb9c0ac2d948a8e8e98f233ad109cd7fc35eab6c (patch)
treeec0d57c0a2b7a27296af698924aaad4992ab07a6 /opengl/tests/gl_basic/gl_basic.cpp
parent5cf5242cc92342dd33e50987d828d2b8c3fabb07 (diff)
parenteb966fc91b06abea5d60a1338a4d115b4d6a7729 (diff)
am b763a6dc: am 08cf57d7: Merge "Fixes to granting URI permissions - take into account path perms." into gingerbread
Merge commit 'b763a6dc41dcce76585c56657903ae72c5422ae1' * commit 'b763a6dc41dcce76585c56657903ae72c5422ae1': Fixes to granting URI permissions - take into account path perms.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions