diff options
| author | Nick Pelly <npelly@google.com> | 2011-01-04 18:35:40 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-04 18:35:40 -0800 |
| commit | d70b1e2069910272bf7798e46a7fef47c6ebc176 (patch) | |
| tree | b0e3b03f4c7a311ec7a5747da70b7071815c68fb /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 75e34731c0b0d893a348821a093af28e40fed71b (diff) | |
| parent | 26e102d2b1abc875a279285e5e3e41dd50ddf604 (diff) | |
am 978e41fc: am 8d98aebe: Merge "Fix technology extra naming for IsoDep and NfcB (API part)." into gingerbread
* commit '978e41fccf278bb64c5204d80d8de95c9bf2e3d5':
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