diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 14:19:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 14:19:58 +0000 |
| commit | 3ebfd0e7e97f5e4cadeae933d51e518c26091fb1 (patch) | |
| tree | bee7682b401932290b0a8affa3cc0dc1a12c099b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 568f7ec214dba806a9454bf91a5da49a7b7c958f (diff) | |
| parent | d2b82ac688fb9eafda9338609a5328f06859331a (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4d541332f9 -s ours am: d2b82ac688 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420419
Change-Id: I089b2a0a296f056da00b4bfaf47dfd4f16c6f822
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions