diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-01-02 08:17:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-02 08:17:19 +0000 |
| commit | e5a0ce6bcdf5918377a14c4d906d56b657e8ab49 (patch) | |
| tree | 3d32c0aca4119a3e2f53495d93af28de453ed26e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e8bd87c530e8f0a5e563e528974d721ef2cd781b (diff) | |
| parent | 1ad5c2f3c7ff3297a5ba066448c4ac218da93321 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e4f60f7dff -s ours am: 1ad5c2f3c7 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1539362
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I26cd6feef0e39ce12bd9a54e96bc367b954cf604
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions