| commit | bf6a7c065213688376259275409b614880d12859 | [log] [tgz] |
|---|---|---|
| author | Myles Watson <mylesgw@google.com> | Thu Apr 11 04:31:05 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Apr 11 04:31:05 2019 -0700 |
| tree | ee7b72c9d54a6ac35aea371b43d32dc2cae905ef | |
| parent | 7a11b2cf89acd5bc7ed3cd5a262329da7566c0be [diff] | |
| parent | 5b78550b206840908bf6de8ff323a18466c3bdf0 [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 skip reason: change_id I711e08b076adb7b4808d04a47cb067cb95606f96 with SHA1 39cda2a286 is in history Change-Id: If16eee53d1f2bbbea6dc4e7e84aecd95fac63e02