diff options
| author | Nick Pelly <npelly@google.com> | 2011-01-04 18:33:41 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-04 18:33:41 -0800 |
| commit | 26e102d2b1abc875a279285e5e3e41dd50ddf604 (patch) | |
| tree | bc367a5d181b3d6c09c9acfb932083ae0ab74ad7 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 25cde516e1c449ba0b7f2ef5957fe12e99046e04 (diff) | |
| parent | 83f1f8ce07d850b21646c1ed2962e11de7f70084 (diff) | |
am 8d98aebe: Merge "Fix technology extra naming for IsoDep and NfcB (API part)." into gingerbread
* commit '8d98aebe286be0ca963232afce3d5ceec67d3d7a':
Fix technology extra naming for IsoDep and NfcB (API part).
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions