summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2011-05-04 12:47:21 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-04 12:47:21 -0700
commit3146d231ccd930df1751a640fc65205f956e64a6 (patch)
tree6fa9206a9b1028672f44ec63fb27853b20b083eb /opengl/tests/gl_basic/gl_basic.cpp
parent4fd1cf42b75e6729d3b8beee69c36c057864ca1a (diff)
parent2d479be9c6f40de79c535fe5f5b9d69515838d5a (diff)
am 63de615d: (-s ours) am 36132a48: DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()
* commit '63de615ddb3cb81bbb5b548693faca971d182a6d': DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions