diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 00:25:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 00:25:53 +0000 |
| commit | 5481fa78373bd477fcfecf35f49d468719d36686 (patch) | |
| tree | bee7682b401932290b0a8affa3cc0dc1a12c099b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e539b278eef2bf56cd834c489e578497dda42d25 (diff) | |
| parent | 93fb60e6269839bcbc224fdd9989e74a22d4b728 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 59abb4f816 -s ours am: 93fb60e626 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420249
Change-Id: I67b5ee8f5b2046b6b8677dcb3cd0c73f3b1d164b
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions