diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-12-05 10:45:05 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-05 10:45:05 +0000 |
commit | ee2e3260811836e83b3a7f868733bce8adb7295b (patch) | |
tree | 7652ac3d66acf9b55fe6815121dd2219e2c8716a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 4130d199f6d14985272a2168c55ba9a059b262b3 (diff) | |
parent | 9ae2812d215bc1459bc0874a8704c46705a65e8f (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 9ae2812d21 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13172259
Change-Id: I20125c8c67cb2dd9a73e81839b4f4d5320ed0604
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions