diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 01:34:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 01:34:09 +0000 |
| commit | 7611af2d645b2b8fa6e731e32a86c83e17c88a64 (patch) | |
| tree | 4ff56bde1d82e854b68b88e14125510cd2de0608 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d527dfcf846b3169c08f9c536b9d2f8c94935c1a (diff) | |
| parent | ba38778241ad098fbbb46906ed25d57ee716729a (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 886806c37b -s ours am: 43cb1c966b -s ours am: e539b278ee -s ours am: f61752a5f4 -s ours am: ba38778241 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420250
Change-Id: Ib79efb31e3eaeff34ccbd3ffba657fd2cac55323
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions