tree 70b9d1614b728720dafb8370b33821e332b48241
parent ac82b0cdc0ab96ac0dbc8b67287718ae7c4e73a5
parent df5f053fb0df3e0fe3dad273550db535b4828ee7
author Myles Watson <mylesgw@google.com> 1554970263 -0700
committer android-build-merger <android-build-merger@google.com> 1554970263 -0700

[automerger skipped] [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
am: df5f053fb0 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia9309fb50eb3f739aadc8ec0333a8c2f1dea7d63