tree 4f9258904ca2e4c1f70f05c9d27c81db297afc3d
parent 50aa991c8d790dccd971c0d2bef78dca280ce8e3
parent 193a85fef2dc800e6d72644c2bb47ee42680f201
author Treehugger Robot <treehugger-gerrit@google.com> 1649465268 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1649465268 +0000

[automerger skipped] Merge "Upgrade statslog-bluetooth-java-gen api level to 33" am: 6fef854007 am: 4226d7b175 am: 193a85fef2 -s ours

am skip reason: Merged-In I4fbfc75b0ede5a37f6f2f82190cd462686fc8a54 with SHA-1 3aa285e4bc is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2024945

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