commit 9bc63e7684d8be50f5b132b5f9dd83222c773e36
Author: Gerrit User 4049693 <4049693@173816e5-2b9a-37c3-8a2e-48639d4f1153>
Date:   Thu May 22 17:28:33 2025 -0700

    Create change
    
    Patch Set 1: Cherry Picked from branch master.
    
    The following files contain Git conflicts:
    * setup.py
    
    Patch-set: 1
    Change-id: I3a5fcf7aa9a210b2f04d11d96f05a2437ffb40f9
    Subject: Edit setup.py
    Branch: refs/heads/main
    Status: new
    Topic:
    Commit: a80a0093347110e679cfb5196e509a9709aa0d15
    Tag: autogenerated:gerrit:newWipPatchSet
    Groups: a80a0093347110e679cfb5196e509a9709aa0d15
    Private: false
    Work-in-progress: true
    Ours: 8d37f6147174fe170cc00a1d82b1cc5fe8ec0a7b
    Theirs: 12f0844600cceceac9a0266e8983f8393f25ccee
    Contains-Conflicts: true
    Cherry-pick-of: 478581,2