diff options
| author | Nick Pelly <npelly@google.com> | 2010-10-18 16:42:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-18 16:42:18 -0700 |
| commit | 79912a6c715ca0e9fcf7b4a49a60e4a1244a6124 (patch) | |
| tree | e3769d4056e98754d7f421575de730e460567a6c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 519d9127ac254523fbe7277e1627df7cc200b6b1 (diff) | |
| parent | ce5b6486019519c874b24665b9ca055c2734540a (diff) | |
am 6b09a90a: am e47150e9: Fix up NFC permissions.
Merge commit '6b09a90a818137de52a0c7325339849ccf584b9e'
* commit '6b09a90a818137de52a0c7325339849ccf584b9e':
Fix up NFC permissions.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions