diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 00:51:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 00:51:51 +0000 |
| commit | 3dc1c0c975b82defa7b8d2a809106546623929e0 (patch) | |
| tree | 891ef4ebfcd5b929c79de95eb3629f3f16d458db /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0d97bcf251b508e41cb86e255185a6da7aec40ec (diff) | |
| parent | 08be94791d92dc58029d5d4be9152e282f3b777d (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: 08be94791d -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419995
Change-Id: I2cf4bb01017bea8d49e03474b582b56ca7323a13
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions