diff options
| author | Santos Cordon <santoscordon@google.com> | 2014-03-06 02:35:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-06 02:35:19 +0000 |
| commit | 91d59ad18c441fce65f36314b4bc10aece3c0c4f (patch) | |
| tree | 7b7fe0254ea422e78cdbe2a220c60fd9c4e8da9d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 47826bfa1627fe84bf2ab5d2ee45845bef7b2ff6 (diff) | |
| parent | 03f0834a03ed8296f31341b6d7b530ea74bc0188 (diff) | |
am 03f0834a: am a04a1fd1: am a45bb4be: am 77a60f00: Merge "Update permission description string." into klp-dev
* commit '03f0834a03ed8296f31341b6d7b530ea74bc0188':
Update permission description string.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions