tree 2446384ffb4228b6562ea2e40954d5f3dfa97b6c
parent 5e77003a85854a89de542c128d587ac609164f17
parent e0a9ada558619c2f59d3ad7342eae7b487ecef6d
author Charlie Boutier <charliebout@google.com> 1725937159 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1725937159 +0000

Merge remote-tracking branch 'aosp/upstream-main' am: e0a9ada558

Original change: https://android-review.googlesource.com/c/platform/external/python/bumble/+/3260642

Change-Id: Ie886013e976ef51c1765e5a758d9139d3a256b38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>