commit | cef75a4337c502dd7ed6c51534522b826f5f3d11 | [log] [tgz] |
---|---|---|
author | Myles Watson <mylesgw@google.com> | Fri May 10 12:21:58 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Fri May 10 12:21:58 2019 -0700 |
tree | d0816609b8b9f05f2513e442c547a0c27365c367 | |
parent | 9674c5438efb66f62f61a292eaeb63bee3b5cff8 [diff] | |
parent | 13251aa47fc9bc0d93627aea85b740411e9e1335 [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 skip reason: subject contains skip directive Change-Id: Ic3efece8729338b22e0b2d015d6ce60d744071f1