| commit | 355931b85bb933e61ac00c3f4d53fbb1d4bdcdb9 | [log] [tgz] |
|---|---|---|
| author | Todd Kennedy <toddke@google.com> | Wed Aug 02 15:27:06 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 02 15:27:06 2017 +0000 |
| tree | f76b071d2c6e93377d6a4945e082d15d6069efba | |
| parent | e98f1e5ac672c23fb622a319e10d0b33faf4b671 [diff] | |
| parent | 7a8c6a39f594e2351aac3f64b8a823850b6e73cc [diff] |
Merge "Fix deadlock between AMS and EphemeralResolverConnection" into oc-mr1-dev am: a3735dc42e am: 7a8c6a39f5 Change-Id: I1d9e4b8d4aec4f9a81d5a0a4d0d520327321f79f