diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-06 16:56:24 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-06 16:56:24 +0000 |
commit | 0de544c1a78a48eb147ad9263a9b10f28b385488 (patch) | |
tree | ba6c3bc9147c41b0b3d62f48824d83f5832ad5cc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 970aabacc5ea5666e7ea262c63db1e486d1475ba (diff) | |
parent | c2605fa581385df9f28214f4edf477ede4129298 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 13eeaecc9d -s ours am: c11efe23f0 -s ours am: c2605fa581 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519355
Change-Id: Ic839f6c5877e44cc78df1182568f5225d16495f1
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions