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