tree bca72f7ecc131163ce72910774ea94755c3368bc
parent 1cafe195ffb4fa4f63092aefc01560a1f6778446
parent 93ad5f4560bd61dfbef722a4081db1b97f32e3d3
author TreeHugger Robot <treehugger-gerrit@google.com> 1630544945 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1630544945 +0000

[automerger skipped] Merge "DO NOT MERGE Bluetooth: Fix formatting in getAlias()" into pi-dev am: 44dc2b273b -s ours am: 34709e93e6 -s ours am: 36fbfc6d1a -s ours am: 01a542b340 -s ours am: 5d9e072094 -s ours am: 93ad5f4560 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15616708

Change-Id: I27eeeb5dac23053bc408f751bd3a8188cdb11590