diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-10-09 03:48:29 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-09 03:48:29 +0000 |
commit | 838bc9752bbdae68806ceb614d722f42eda93cba (patch) | |
tree | 19febf1d3029ca8f11138fb938297c7925114ab6 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 7f963de1d76706069011353c486051567c1ad311 (diff) | |
parent | 1015bae311220fe8242c33e58e11a932ed6f8a3a (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 1015bae311 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12796397
Change-Id: I1e4b9417576bc43f497632ca7e3fd94f028a49c1
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions