commit | 3ec8da88d383145a5011eab5036c22b9a4dc7224 | [log] [tgz] |
---|---|---|
author | Jędrzej Ciupis <jciupis@google.com> | Thu Dec 05 12:37:51 2024 |
committer | Bartłomiej Bujak <bbujak@google.com> | Thu Dec 05 12:44:20 2024 |
tree | 5f9f0b1d33c74c8d5addf8b4787fb6e8154cbf93 | |
parent | cd4e3d28d9bf88959067341b0a7867328c5b2310 [diff] |
Update conflict resolution for bluetooth for v6.12 Change-Id: If2519cf54fe7945bda1de30984783176f0c0642f Signed-off-by: Jędrzej Ciupis <jciupis@google.com>