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