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

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

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

[automerger skipped] Merge "DO NOT MERGE: BondStateMachine: Check for null before calling getDeviceType" into oc-dev am: b8028c55 -s ours am: 26c4abe2 -s ours
am: 69b795b8 -s ours
am skip reason: subject contains skip directive

Change-Id: I0e5ba9e4ba60a26f6e864e2590b9edc8e1500e4f
parents 5a2f3afc 69b795b8
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