diff options
| author | inazaruk <ievgenii.nazaruk@gmail.com> | 2012-02-23 18:49:47 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-23 18:49:47 -0800 |
| commit | a12522b73dac6baf622004f77ad97ac47059c21f (patch) | |
| tree | 958071c79627ca1be8e55fe2f45945de608717e6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 7f547f3e71d30a32381c0f2c6c7f586f42648c91 (diff) | |
| parent | 737d6ef5f1b545f3fc3bb0d839abc9a421760ed1 (diff) | |
am 737d6ef5: (-s ours) am 68ad43e1: am eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
* commit '737d6ef5f1b545f3fc3bb0d839abc9a421760ed1':
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions