diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-03 02:35:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-03 02:35:22 +0000 |
| commit | 41ee550106114b11a0c62f0518879885a6b52b0d (patch) | |
| tree | a790eef76984bd0e3aa7c73fefa9c9b4214eda78 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 02a3f801f2fcf0bb5f8570bc5332aec3949f5bc1 (diff) | |
| parent | 1188f07975cd66069f6068f68c0854939bbbf723 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 3a301e8671 -s ours am: 493592907d -s ours am: 43662e1979 -s ours am: 1188f07975 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515857
Change-Id: I06d41f3431fefb2217d8e47bb5bcf93287a3d1f0
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions