tree 5f9f0b1d33c74c8d5addf8b4787fb6e8154cbf93
parent cd4e3d28d9bf88959067341b0a7867328c5b2310
author Jędrzej Ciupis <jciupis@google.com> 1733402271 +0000
committer Bartłomiej Bujak <bbujak@google.com> 1733402660 +0100

Update conflict resolution for bluetooth for v6.12

Change-Id: If2519cf54fe7945bda1de30984783176f0c0642f
Signed-off-by: Jędrzej Ciupis <jciupis@google.com>