diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-04 21:10:09 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 21:10:09 +0000 |
commit | c17e172a6b229d69a8681149dc20e310a04b6745 (patch) | |
tree | c9e5cc728e671a5de21b72d7c756453b05db63ef /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 339c6199cd917319cb61d8b0ca0d1c801873afd2 (diff) | |
parent | e91eaccd32193e7b7d79a98b49c109eb607fba04 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: eddce3d73f -s ours am: 7fc8a3361e -s ours am: e91eaccd32 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420155
Change-Id: Ifa5cccd4000726702512adb06440d556210097c0
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions