diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-19 09:22:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-19 09:22:21 -0700 |
| commit | 29c733110af19dfb6bae0349cde3fb3a9c3cbeaf (patch) | |
| tree | 6993687d0c39d4fe3303d40166c0ad7450e9e969 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 3d8ba4a2650cf86214491ba67c96d8d960897bb7 (diff) | |
| parent | 5b417743a5960649e53634a18698b4d403fb7acb (diff) | |
am 2dc7c6c4: merge from open-source master
Merge commit '2dc7c6c4153380fc64b99d37d763d3f0d1cac04d' into kraken
* commit '2dc7c6c4153380fc64b99d37d763d3f0d1cac04d':
Add and document .nomedia constant for MediaStore (Issue 6365)
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions