diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-08 20:37:03 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-08 20:37:03 +0000 |
commit | 94c950d6244e34241975588ddfaa8d3c6519f89b (patch) | |
tree | 5af61200cc18b111678c779a109ada623394a8f5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | cce53acfeec2328a7f89dd2d6b7fb10fc5c7440a (diff) | |
parent | 6508923c5956b5ad893fabc3df83bf7886660435 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 82993ac937 -s ours am: 6508923c59 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12337741
Change-Id: I7b5f6b4cfa0351269f037f2f629a0604db1e0cec
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions