diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-08-28 08:37:36 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-28 08:37:36 +0000 |
commit | 5738b157c02192b60816b4034bf0920d15951fe3 (patch) | |
tree | 5772ace5ea5a6ed96b51a3a73eac907d45477c05 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 6a51fdd26455b67a3e0970d42ea35da212e95775 (diff) | |
parent | 8a48ffefc0fcf49bf6956605424e27cd650df9f7 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 3136ec7b40 -s ours am: 8a48ffefc0 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15693271
Change-Id: I6df00eede08c0f6e0ec0dda89fa1b40731d466fb
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions