| commit | 9bc4eea957f7d0ba98ec117e7a188d3b5f134890 | [log] [tgz] |
|---|---|---|
| author | Myles Watson <mylesgw@google.com> | Thu Apr 11 04:40:57 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Apr 11 04:40:57 2019 -0700 |
| tree | 40ea21fc1b96f1f09b85ba3c04bdb1ed2d246631 | |
| parent | d1ee7f81c7a6f822f6fd1705077e0da041923ce4 [diff] | |
| parent | 7dc18468c82f6f36567e885c946453877aab8c20 [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: 7dc18468c8 -s ours am skip reason: subject contains skip directive Change-Id: I28ce2beaa405b421d4f2390d2fd5c1aee062c421