diff options
| author | Dan Morrill <morrildl@google.com> | 2010-09-01 15:05:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-01 15:05:34 -0700 |
| commit | fd1fc2949c044aff8f974b87c45968de5aa527a6 (patch) | |
| tree | 5a438d33fa40180d101fc1ad648ae2e7d3acbe3c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 1b8ae0845d2ca9f24fb72b25eff0021f5bfe53cf (diff) | |
| parent | 8bdbfa13b8feeab83d85211b8a4572fc71ed0645 (diff) | |
am a800a2ef: Merge "Adding a feature definition corresponding to support for Near-Field Communications (NFC)." into gingerbread
Merge commit 'a800a2efa29d88e198220753f07e7d9ff69ddd9b' into gingerbread-plus-aosp
* commit 'a800a2efa29d88e198220753f07e7d9ff69ddd9b':
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