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

Commit 53982a64 authored by Myles Watson's avatar Myles Watson Committed by android-build-merger
Browse files

[automerger skipped] Merge "DO NOT MERGE Revert "BondStateMachine: Check for... 

[automerger skipped] Merge "DO NOT MERGE Revert "BondStateMachine: Check for null before calling getDeviceType"" into oc-mr1-dev am: 330d4e15 -s ours am: 742cded9 -s ours
am: 9b8d4147

Change-Id: Id7601538990a144405405a71d00d5ef5e3c3b917
parents 30fe8b39 9b8d4147
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment