diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 05:40:44 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 05:40:44 +0000 |
commit | 725d9537a1c2be8cb2eb8dfb2b06d9efbc289bce (patch) | |
tree | c9e5cc728e671a5de21b72d7c756453b05db63ef /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 6784db4ef630878360d8848041f35d6a1c172787 (diff) | |
parent | efb5c312d49d8ac937838445f3e75143cf8f5c0f (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 61298b480c -s ours am: 6da5b0de3d -s ours am: efb5c312d4 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420260
Change-Id: Ifc4ef3c083b892d43db654f09b75f60b0365e169
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions