diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-06 14:52:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 14:52:45 +0000 |
| commit | 30b5ec1d08b546149dc8efd129252457389edc51 (patch) | |
| tree | b5d9df6968d259c499fe2a907f44a20a61d873e5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3a4ec0d69a682be322af2ed154006f710ac39ae3 (diff) | |
| parent | 0832e15d77656e07acdf5e7565911129b59a192f (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8adc4f7f3f -s ours am: e9ae85a025 -s ours am: 04c0296a72 -s ours am: 44d9cd3f52 -s ours am: 0832e15d77 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086570
Change-Id: Ieccf5c5b07ac34ffa72ddc68e4729b38d97af174
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions