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

Skip to content
Commit bf6a7c06 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 skip reason: change_id I711e08b076adb7b4808d04a47cb067cb95606f96 with SHA1 39cda2a2 is in history

Change-Id: If16eee53d1f2bbbea6dc4e7e84aecd95fac63e02
parents 7a11b2cf 5b78550b
Hide 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