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

Commit 742cded9 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 skip reason: subject contains skip directive

Change-Id: I05fc379f8876baf2c6ee3bf0927ac55b21ccac3f
parents 698ae268 330d4e15
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