| commit | 7dc18468c82f6f36567e885c946453877aab8c20 | [log] [tgz] |
|---|---|---|
| author | Myles Watson <mylesgw@google.com> | Thu Apr 11 04:35:54 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Apr 11 04:35:54 2019 -0700 |
| tree | 6f6d487fc9b00ff0c2b2af70279f4018cce1ffed | |
| parent | b6ad28d7acb00728a7209944b57af55b9318b818 [diff] | |
| parent | bf6a7c065213688376259275409b614880d12859 [diff] |
[automerger skipped] Merge "DO NOT MERGE: BondStateMachine: Check for null before calling getDeviceType" into oc-dev am: 8e45731c05 -s ours am: 5b78550b20 -s ours am: bf6a7c0652 -s ours am skip reason: subject contains skip directive Change-Id: I0e5ba9e4ba60a26f6e864e2590b9edc8e1500e4f