diff options
| author | Bill Yi <byi@google.com> | 2019-07-31 15:07:36 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-31 15:07:36 -0700 |
| commit | 15ced1102b38646fb4a9a00abd4ea75465e2f30f (patch) | |
| tree | f1eddefe3f23db932fb15612c8319ec4c63cf762 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f95ecac2cdf1ca8d243456d0cbd1b860779a25b9 (diff) | |
| parent | de521e7d3d8ef3e25020c0c457aa4e71b9a2ed88 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: de521e7d3d -s ours
am skip reason: subject contains skip directive
Change-Id: Ie255864b50cd426e43ae34cc88729a508451e1a9
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions