diff options
| author | Nick Pelly <npelly@google.com> | 2010-09-28 22:40:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-28 22:40:18 -0700 |
| commit | 6f767084051f40a987f351b98f9027392f7110f9 (patch) | |
| tree | 98c2aa54138fd908e08466ccfb8567ddb09e10bf /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 83c3741a90b79a43d864528607963c09364f4f86 (diff) | |
| parent | 5be7524e145240058eff55e773dc71a7ab75a390 (diff) | |
am 038cabe0: NFC integration
Merge commit '038cabe0247ee46df62f9363f1a303bc5b9c1028' into gingerbread-plus-aosp
* commit '038cabe0247ee46df62f9363f1a303bc5b9c1028':
NFC integration
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions