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