diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-04 09:05:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 09:05:05 +0000 |
| commit | c6ff40799812583ad46d3e09100a7802d1afe8db (patch) | |
| tree | 8319687fc73911705cea79427cc774ec5d2677cc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | dbcf9a74dc1b11e7978b336428329546c4b8cdd5 (diff) | |
| parent | 1842ed0a4f80fe8f65754180ee76a13bc47342b6 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a37e4c6327 -s ours am: e2f78c8a82 -s ours am: c52327b714 -s ours am: cbc7b55c3d -s ours am: 1842ed0a4f -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419991
Change-Id: I7cdf72dd242723924cfc186c6af2674dd40a9a0f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions