diff options
author | Santos Cordon <santoscordon@google.com> | 2014-03-06 01:56:50 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-06 01:56:50 +0000 |
commit | a45bb4be2f12144754aa62a5d44c39db08b21c92 (patch) | |
tree | 24942a7aef2317a2bec82bdf55f5e89552beedda /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 4448f9d7ade3d08a29b1a191e182a403c5584388 (diff) | |
parent | 77a60f006f8b7260207043529d3ed004db301bd5 (diff) |
am 77a60f00: Merge "Update permission description string." into klp-dev
* commit '77a60f006f8b7260207043529d3ed004db301bd5':
Update permission description string.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions