tree ea36e0ceb280206661c71c1001b80722835eaa8e
parent d4911d5b2c7a7a74c19b74ee469cb15ba7361a0b
parent 3fac6d3746800942ad165d522470a89962d56a3d
author Etienne Ruffieux <eruffieux@google.com> 1639600477 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1639600477 +0000

[automerger skipped] Merge "Replaced Bluetooth SystemProperties.set by sysprop" am: 4d612ad87b am: a9e669070b am: c748403369 am: 3fac6d3746 -s ours

am skip reason: Merged-In I613808dbc930c90e391df9857a173a86aedc4acf with SHA-1 f636a3147f is already in history

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

Change-Id: I69f46eea4a7a20c2b670215da8aacf347afcb21a