diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-10-07 17:17:20 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-07 17:17:20 +0000 |
commit | 5ce35c29088cd8e110e830174a24d0f709e87f6d (patch) | |
tree | e438ef22e0f062feac1b33fea870b1157860977c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 38b00969e879aaef6f0e3511a52b81ce677c76aa (diff) | |
parent | 9339405d4329d13866a1b49ba4aa672da34a7a60 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b3cbc66070 -s ours am: 9339405d43 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12781701
Change-Id: I3c1f2a86811496af314bb368a3776688aea22d97
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions