diff options
author | Santos Cordon <santoscordon@google.com> | 2014-03-06 02:57:25 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-06 02:57:25 +0000 |
commit | 2c9fc10554b734c63a4cbbf84b4bbc0c17d3ff11 (patch) | |
tree | 6a67e067e76acc5a4c6bec11ac653724396882b5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 5ab311550f01412c12c1c68fe75ae929c9d1e9d8 (diff) | |
parent | 2fab2f63676af8a8f45fd303b255c88761c4f224 (diff) |
am 2fab2f63: am 91d59ad1: am 03f0834a: am a04a1fd1: am a45bb4be: am 77a60f00: Merge "Update permission description string." into klp-dev
* commit '2fab2f63676af8a8f45fd303b255c88761c4f224':
Update permission description string.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions