Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15d31d57 authored by Hui Peng's avatar Hui Peng
Browse files

Add tests for the following change

Handling automerger reported conflicts in the following brances:
- b/304684796
= b/304651812
- b/304652020

CL: I59b208d403d6f16a8515b351f4c296f9affdf37b

Bug: 263958603
Test: atest net_test_bta
Ignore-AOSP-First: security
Tag: #security
Merged-In: Ia587191901112d9e3ab15faefb1ca0f914e127ef
Merged-In: Ie5575296ff75059ccef7b240c7f47e8339e71c09
(cherry picked from commit a6b4a43d)
Change-Id: Ie70c6fa78d4a64a81753860fbf3b232538e79f17
parent 64ddb280
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment