| commit | 13251aa47fc9bc0d93627aea85b740411e9e1335 | [log] [tgz] |
|---|---|---|
| author | Myles Watson <mylesgw@google.com> | Fri May 10 12:07:06 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 10 12:07:06 2019 -0700 |
| tree | 39d1f29a4bea6b535d3815e1a2bf075b208d4952 | |
| parent | 56c0c2f8071cc7950bf92dc7f807feac4855ab24 [diff] | |
| parent | 8b4e8193cf370153158f822bb5e203e229a5d79a [diff] |
[automerger skipped] Merge "Revert "DO NOT MERGE: BondStateMachine: Check for null before calling getDeviceType"" into oc-dev am: 43d0b63891 am: b22a98c98f -s ours am: 8b4e8193cf -s ours am skip reason: subject contains skip directive Change-Id: Ia86241d85d70d4252c53b00ef3feccdab791250d