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