diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-05-04 12:47:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-04 12:47:18 -0700 |
| commit | 4fd1cf42b75e6729d3b8beee69c36c057864ca1a (patch) | |
| tree | 6fa9206a9b1028672f44ec63fb27853b20b083eb /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 233c6b3270b218cf6f534a9a5b0573d6d8b87819 (diff) | |
| parent | 609e1d9ac635b916b20c2969e772ef575af63da5 (diff) | |
am 0faefb72: (-s ours) am 8b1c74f9: DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
* commit '0faefb72fb8917c9408f7b71c2bac5a9d5f264c2':
DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions