diff options
| author | Nick Pelly <npelly@google.com> | 2010-10-21 13:50:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-21 13:50:09 -0700 |
| commit | 2a734d952cddb1ffa5d230cb8b0d75047722df95 (patch) | |
| tree | f3551db9e5b953b71b7dd63e361d0aeff246001a /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 8112eeee4f43c09aa3e54db29fade56967e407d7 (diff) | |
| parent | 888ddb301cf82d7c533ccd263908ee962927ab5c (diff) | |
am c0e93a84: am 7ea5c45e: NFC settings cleanup.
Merge commit 'c0e93a849f82c97b847c9ad39b18e594f3bb3f5a'
* commit 'c0e93a849f82c97b847c9ad39b18e594f3bb3f5a':
NFC settings cleanup.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions