diff options
| author | Martijn Coenen <maco@google.com> | 2013-10-23 11:22:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-23 11:22:05 -0700 |
| commit | 3aab4962513bc61ea75ac1e4cc239a97ee5f1860 (patch) | |
| tree | 27767b28ae447016c2845d4bf1614fd6c5b7449d /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ae25a1a89b777c444df5d34a2537aff3f5c2249b (diff) | |
| parent | 41fab0a19caeb8077171f0eb605f416cbc4a0ef0 (diff) | |
am 41fab0a1: am fa191d5a: am d9e98a4b: Merge "Unhide BIND_NFC_SERVICE permission." into klp-dev
* commit '41fab0a19caeb8077171f0eb605f416cbc4a0ef0':
Unhide BIND_NFC_SERVICE permission.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions