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 | bea97a897b9102d5d75bcb7a41e02eaff9a7506d (patch) | |
| tree | 80894ff99019e573f50527729f3659b2f73a9243 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b39b0f32d1c24e326886d8d27c8ad7dde38e28d0 (diff) | |
| parent | 2dc7c6c4153380fc64b99d37d763d3f0d1cac04d (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