diff options
| author | Bill Yi <byi@google.com> | 2019-07-14 16:51:23 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-14 16:51:23 -0700 |
| commit | ed54d0bf9d4ede3e3069ed7838f22c2fc236692d (patch) | |
| tree | 784b697094684c896cc3bd7fac6be298f5425444 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 202fa92c929e1a8560ddd77217b85957e71bced4 (diff) | |
| parent | 8797e309dd22d8d0cec261dc2edb1d5189661d4b (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 8797e309dd -s ours
am skip reason: subject contains skip directive
Change-Id: If6ea57aa1f74654037c92baa925a8658d2c02be7
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions