diff options
| author | Dan Morrill <morrildl@google.com> | 2010-09-01 17:03:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-01 17:03:33 -0700 |
| commit | 52643b82b51db58a891aa043899b96afdb7a80a5 (patch) | |
| tree | a5b01e7714e08c28da6d945bea0296d013cbaccf /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 21395d428b16e2388929dfeec0e8ebe57e0f0efb (diff) | |
| parent | fd1fc2949c044aff8f974b87c45968de5aa527a6 (diff) | |
am 61f1cbdd: am a800a2ef: Merge "Adding a feature definition corresponding to support for Near-Field Communications (NFC)." into gingerbread
Merge commit '61f1cbdd71942433ce1515b614ec3d9c259ea037'
* commit '61f1cbdd71942433ce1515b614ec3d9c259ea037':
Adding a feature definition corresponding to support for Near-Field
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions