| commit | 7a8c6a39f594e2351aac3f64b8a823850b6e73cc | [log] [tgz] |
|---|---|---|
| author | Todd Kennedy <toddke@google.com> | Wed Aug 02 15:16:23 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 02 15:16:23 2017 +0000 |
| tree | 14ce210bc726dcd0c61e0b2b949a8999305fb444 | |
| parent | d848c25c8d0170ec3e8f8596af7d7039ee93f305 [diff] | |
| parent | a3735dc42e6d8177e28feba2d5dac0f0cd6de5a6 [diff] |
Merge "Fix deadlock between AMS and EphemeralResolverConnection" into oc-mr1-dev am: a3735dc42e Change-Id: I9698b051ffd874692476419bfd7a4bb115ec6ef7