diff options
| author | Baligh Uddin <baligh@google.com> | 2015-09-29 14:49:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-29 14:49:59 +0000 |
| commit | 40359e0322822cab3b6a00f3ce30a3cf0e7d7a6f (patch) | |
| tree | 27538a6101c75339440c743ff698bddea7539dc9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e3e11d6dac4b0ac43a9da028d1c0759081cbd425 (diff) | |
| parent | ae442bafad49c8fa889b41771b0a8a505a427988 (diff) | |
am ae442baf: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit 'ae442bafad49c8fa889b41771b0a8a505a427988':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions