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