| commit | a3735dc42e6d8177e28feba2d5dac0f0cd6de5a6 | [log] [tgz] |
|---|---|---|
| author | Todd Kennedy <toddke@google.com> | Wed Aug 02 14:59:19 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Aug 02 14:59:19 2017 +0000 |
| tree | c4441b397459eb1db433a4442e196fd5e2275566 | |
| parent | 9f38e0f5e7848ee9ee3c9f5a74f697d4cba85d7f [diff] | |
| parent | e2612eb3f59b2586273fd52a211ee430b0ccf8c2 [diff] |
Merge "Fix deadlock between AMS and EphemeralResolverConnection" into oc-mr1-dev