diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-04 20:29:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 20:29:41 +0000 |
| commit | 48bea730ebdcf10accfc21eb9239fbdc31bebb30 (patch) | |
| tree | bee7682b401932290b0a8affa3cc0dc1a12c099b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2ca918b7690582d95549b7b11ded674717efc754 (diff) | |
| parent | cd1c28afa7b77f0730fe17aa95395472a347e639 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5854961552 -s ours am: cd1c28afa7 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420153
Change-Id: I563fdc79315c98f997e473dccd1c8d022394ab82
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions