diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-22 15:07:25 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-22 15:07:25 +0000 |
commit | c8f10cc0b9edd3bedde1ee1151f47e0a7e010c0d (patch) | |
tree | 209eec3efa43e43f1795f95905ae61eec575e3a7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | af6ba839cd5f544f7bb19d66e8202efbd2aa62ec (diff) | |
parent | 5f131cde668f8361a3872216f22cbae0c73b5067 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 30166a7e23 -s ours am: d274706b8d -s ours am: 5f131cde66 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12428382
Change-Id: I6d0d71607158cecf346da6b0ac2c2b9c35c8c990
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions