diff options
| author | Geoff Mendal <mendal@google.com> | 2015-08-10 18:14:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-10 18:14:14 +0000 |
| commit | 31a0f46f5feb8aab38cc46cc2a8d48c080a3fd96 (patch) | |
| tree | 9aaf1eab950708142a1b6ef2a6282202e8c48852 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 20272bec66c3ff9f43861d1c5d5d2c2af71673d4 (diff) | |
| parent | 3ea5cfa8e8dcedc9b17bd637be631ad2559cfb72 (diff) | |
am 3ea5cfa8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '3ea5cfa8e8dcedc9b17bd637be631ad2559cfb72':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions