diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-15 07:30:23 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-15 07:30:23 +0000 |
commit | 67f786c9c11a8a4f46056c04c416d95dba4525f3 (patch) | |
tree | 47d62c30a1a3287e5facb2debdeb11c35b010f34 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 7dd2d331478e4fed4a18e6dc5b6338cbc9099d68 (diff) | |
parent | 89480557f4259f833ab7f9d95b9aeeecd944c422 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 24761341ad -s ours am: 89480557f4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12384167
Change-Id: I374b2b7f15ad1da0bd2dbc6d25300c099f807cbb
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions