diff options
author | Dirk Dougherty <ddougherty@google.com> | 2014-03-03 22:24:14 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-03 22:24:14 +0000 |
commit | 0054ed815a3db340a27d8a179d3b748bf3eeaaf0 (patch) | |
tree | 4fd16eb7fc16fe1f6646b6b481242e5f96b63d13 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 1fdcab956d55418febbbc0f5928242c3420bd16a (diff) | |
parent | 8bb3b8f805658ecf9106778992dceea9a05dcc4c (diff) |
am 8bb3b8f8: am 95cf532f: am 26de0b71: am cce121fb: Merge "Update permission description string." into klp-docs
* commit '8bb3b8f805658ecf9106778992dceea9a05dcc4c':
Update permission description string.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions