| commit | 0d4e83a15524d3c860e438b921a97cbaf352859e | [log] [tgz] |
|---|---|---|
| author | Myles Watson <mylesgw@google.com> | Fri May 10 13:26:02 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 10 13:26:02 2019 -0700 |
| tree | 62cca63ee1e50d610cd058b14715cba66c98dae3 | |
| parent | d87a8eecb58025c012da71548d1d58496e43fae5 [diff] | |
| parent | cef75a4337c502dd7ed6c51534522b826f5f3d11 [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: 13251aa47f -s ours am: cef75a4337 -s ours am skip reason: change_id Ia20df8fd920e86661beb5249e72464c8e9777815 with SHA1 3cae706d8e is in history Change-Id: Ic780d64288eb8c1c3f72b445df131b9254796833