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

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

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

[automerger skipped] Merge "Revert "DO NOT MERGE: BondStateMachine: Check for null before calling getDeviceType"" into oc-dev am: 4e3b8eef am: a63fe1ac -s ours am: 50470cf4 -s ours
am: e49b5317 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic3efece8729338b22e0b2d015d6ce60d744071f1
parents d2b3d34d e49b5317

There are no changes