diff options
| author | Bill Yi <byi@google.com> | 2017-07-07 15:54:31 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-07 15:54:31 +0000 |
| commit | 1125f26d5f331733a2b848cda0cd7fd52351bb3a (patch) | |
| tree | 9f882343230d73dc8662847f5c41a34a527baca3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8ae470614fbe72021b8a87fb8b434a4242f99146 (diff) | |
| parent | 33393ffa7d0b9c4e7f339d27bb7f71af6caf9a15 (diff) | |
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 33393ffa7d -s ours
Change-Id: If4cd6d9504c519c186e1f3a1913ed91e81a3ae6b
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions