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