diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 07:15:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 07:15:30 +0000 |
| commit | 610f0600a188e6bb87ded4c64b7a1882881fcff3 (patch) | |
| tree | 4ff56bde1d82e854b68b88e14125510cd2de0608 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1fd37d5d585938d505642a2c14fedd9bf4058baa (diff) | |
| parent | bc7d031472967b8cbcbbf1d49b276515e6a68a0c (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: f3a7728fb9 -s ours am: 9cbec70a10 -s ours am: 8a48949a09 -s ours am: 1da5b2d44c -s ours am: bc7d031472 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420409
Change-Id: I0d11002d5104425dae0b1998331a395149ca2052
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions