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 | 6b09a90a818137de52a0c7325339849ccf584b9e (patch) | |
| tree | 4c49fb7abab08772e9cb6f4652ad620361e13d15 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 774b943fc6baa7d3e2880382d4dc7ab085d54b65 (diff) | |
| parent | e47150e933e6f610546f57183477f324566e521e (diff) | |
am e47150e9: Fix up NFC permissions.
Merge commit 'e47150e933e6f610546f57183477f324566e521e' into gingerbread-plus-aosp
* commit 'e47150e933e6f610546f57183477f324566e521e':
Fix up NFC permissions.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions