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

Skip to content
Commit 9bc4eea9 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: 8e45731c -s ours am: 5b78550b -s ours am: bf6a7c06 -s ours
am: 7dc18468 -s ours
am skip reason: subject contains skip directive

Change-Id: I28ce2beaa405b421d4f2390d2fd5c1aee062c421
parents d1ee7f81 7dc18468
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