diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-02 20:35:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-02 20:35:32 +0000 |
| commit | 0b9e08618434b9e265cdf7e88ce2d873b3ac5dbb (patch) | |
| tree | 7cd49368d5c807f0230d697672a27df038af1f0d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | eb2361e662bfc138975a66c92c5ecfe343d4f5b2 (diff) | |
| parent | 26a58d39ec56b9a85d63c40b1690e71f7d6275b7 (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513831
Change-Id: I57cd97669e1da98c8c0c3f980508839d244a235d
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions