diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-04 09:05:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 09:05:42 +0000 |
| commit | 955f115336a8eeb30a35e5ee7e3fbe9db04f6075 (patch) | |
| tree | 8319687fc73911705cea79427cc774ec5d2677cc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c6ff40799812583ad46d3e09100a7802d1afe8db (diff) | |
| parent | 8de2dabe83984d8f013b41a07750b7acc9840357 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ec08343fc5 -s ours am: 063c5052f8 -s ours am: 47d8fdb784 -s ours am: aca4566be7 -s ours am: 8de2dabe83 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419990
Change-Id: I53d8702e61a9438bb0f0d14dc27b754e4cbf896a
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions