tree 184254bbcacddbcd02803f4337357f006dd2edea
parent 1afe196758b2895c83a0a622b57ea7450a5918ff
parent 5e2e6697ec6675568176d2693b4fe95e4137cb5d
author Myles Watson <mylesgw@google.com> 1554963133 -0700
committer android-build-merger <android-build-merger@google.com> 1554963133 -0700

[automerger] DO NOT MERGE: BondStateMachine: Check for null before calling getDeviceType am: 39cda2a286 am: ecc5b62100 am: 090b2dd50f am: c510171295 skipped: a5fb533ed4 am: 77d4863bd1
am: 5e2e6697ec

Change-Id: I176bfa05ac5990b77defb24e0588c2eb38b6a6a4