diff options
| author | Bill Yi <byi@google.com> | 2019-09-25 22:19:58 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-25 22:19:58 -0700 |
| commit | 689e9e1dcd4929edae2b8dd3197cb303612de08a (patch) | |
| tree | 3c1b7fd33ffd5e0318525d990479be98c2f7c421 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3ff16a43b5e59ea7c1743497bb4e7d2bb303ac13 (diff) | |
| parent | fd8f5dc84128b4366cd13a5da02569d1b0280471 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 4160fa8a6d -s ours am: 9e4189fef5 -s ours
am: fd8f5dc841 -s ours
am skip reason: subject contains skip directive
Change-Id: I9aa4b1bff3c045fc2a6a9a6a1f38568c0f5045d4
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions