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

Skip to content
Commit 26c4abe2 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 skip reason: change_id I711e08b076adb7b4808d04a47cb067cb95606f96 with SHA1 cebf7b93 is in history

Change-Id: I062ba4d23055ce7b43faad3481e5f0d50bbf4be8
parents e95a8eb8 b8028c55
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