diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 00:25:04 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 00:25:04 +0000 |
| commit | 08be94791d92dc58029d5d4be9152e282f3b777d (patch) | |
| tree | d5d8afda55ebbeb886aebc62d0e0bbc6706fac79 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 817bf1ad48e0c5ce1d527301aabed845dff2ff1b (diff) | |
| parent | d2252bc5c3fa3334841ef4a08d2171b8ab5675e9 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: eb3dd3dcc5 -s ours am: 8e0aa0a5f7 -s ours am: 404bc1e6f6 -s ours am: d2252bc5c3 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419995
Change-Id: Id719a69b580fe631671451d4f8ae23cea0bc3fbb
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions