diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-03 05:54:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-03 05:54:28 +0000 |
| commit | f07cd3136c46a33dc9054f78209727431a289b9f (patch) | |
| tree | 9a59afd7f269c11ca89d2475af94bb8779712705 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c5affcb99e345fb49a7cfa2364ff968d3a7f7978 (diff) | |
| parent | d6e89f519a55eb13e63e0d5ade7358951551795e (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: dd7986c31a -s ours am: 4ec3aa4d09 -s ours am: 60e40d9c33 -s ours am: d6e89f519a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515618
Change-Id: I93c1a30d87601f8e3880f4a88fb3a18a5ac6aa9f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions