diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-06 09:00:58 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 09:00:58 +0000 |
commit | f3f6295c7fa5999012986d140b6c2a9244949ba1 (patch) | |
tree | 43b104fb0ef80604591f1a33dc1a46540b6f3e25 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 380189bdec66bf596756a5bb1a805d15ed9cfe98 (diff) | |
parent | f610cd79bd23dc82ec3a6524dca3bde145e1d1b7 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 65997ef7b3 -s ours am: 3d121d3920 -s ours am: f610cd79bd -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12079859
Change-Id: I5fd42dde7ff9b19b667291f46d2057f544d23ea0
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions