diff options
| author | Nick Pelly <npelly@google.com> | 2011-11-14 19:40:46 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-14 19:40:46 -0800 |
| commit | fb52c4747687819238eb4570ee7d424842c6159f (patch) | |
| tree | 852d0a296ce3c2202f73d04362d6b6123e94a362 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f1c78890dc703f44227b556e71624bed7eef95a1 (diff) | |
| parent | a26cf3011157eb94fa2766e76fa0096628c16c18 (diff) | |
am a26cf301: Merge "Enforce 1-1 relationship between context and NfcAdapterExtras." into ics-mr1
* commit 'a26cf3011157eb94fa2766e76fa0096628c16c18':
Enforce 1-1 relationship between context and NfcAdapterExtras.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions