diff options
| author | Nick Pelly <npelly@google.com> | 2010-10-18 10:26:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-18 10:26:12 -0700 |
| commit | ce5b6486019519c874b24665b9ca055c2734540a (patch) | |
| tree | 019ca26084abbcccb357df956b5df2b574c4e8e2 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | a00c5f11693f880261c55f0dabf22f14799d1986 (diff) | |
| parent | ecbb38c225831da5eccaa5af6855af86b33fbc59 (diff) | |
am e47150e9: Fix up NFC permissions.
Merge commit 'e47150e933e6f610546f57183477f324566e521e' into gingerbread-plus-aosp
* commit 'e47150e933e6f610546f57183477f324566e521e':
Fix up NFC permissions.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions