summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-10-08 15:24:30 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-08 15:24:30 -0700
commitf54a0e101a254c69665045a2532848e22686958f (patch)
tree4ab9c2f41c50fe8c8a3546e71440f2dc9995a30f /opengl/tests/gl_basic/gl_basic.cpp
parent0aeef9c1d84e52f5e378126f91cd88ae912da203 (diff)
parent9c331df44c7c7daa83b0b1efd381ba88786832a4 (diff)
am 62d8874e: Merge "Fix retaining of granted permissions when updating of system app." into gingerbread
Merge commit '62d8874eb74045b37140857ea3b31f198f0adffa' into gingerbread-plus-aosp * commit '62d8874eb74045b37140857ea3b31f198f0adffa': Fix retaining of granted permissions when updating of system app.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions