diff options
| author | Nick Pelly <npelly@google.com> | 2011-01-03 21:03:06 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-03 21:03:06 -0800 |
| commit | 7cb15a1b5c588e355bb094c4ea5aa9042eeb9ccf (patch) | |
| tree | 3c79927171ef7c58e4f933a84d34dc9eb4034808 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 595066719f814725a88e4fe3220915b73ca67a33 (diff) | |
| parent | 775997cf4d5a7a523202f2a7e60ad9a78b3d3ac0 (diff) | |
am a3e4293c: am 163bd407: Merge "Added getType() to NDEF technology class (API part)." into gingerbread
* commit 'a3e4293cdc7d09ac93c95d233e4052ac4435773e':
Added getType() to NDEF technology class (API part).
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions