diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-02 20:59:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-02 20:59:45 +0000 |
| commit | 0176bb7c385e6104473c73d0e5b8511b9365d801 (patch) | |
| tree | eee734518e2b2b359a06d52de9931e32dd3a25b2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e04f7617f5ea3d9f702a17685b85b58b1952e440 (diff) | |
| parent | 0b9e08618434b9e265cdf7e88ce2d873b3ac5dbb (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 2b8767c457 -s ours am: c10ee328af -s ours am: 26a58d39ec -s ours am: 0b9e086184 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513831
Change-Id: Icffbc2df85588d413dc843b9807a11818920182b
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions