diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-21 23:17:14 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-21 23:17:14 +0000 |
commit | b052a1d13bac3e2badac3b64543684d82b791ffc (patch) | |
tree | 18c80e84a75d7c9015aa6ecd8f8db2a8628aff35 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 1da7821989da17be3a12b939ca803fc171181614 (diff) | |
parent | 10cb38987863f5aac5ba91687aab851f98a93b50 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 68755307c0 -s ours am: ca9ccd787a -s ours am: 10cb389878 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12424091
Change-Id: I97b07068d651740e18c1203b0c9084cc76e60414
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions