OSDN Git Service

Merge "Fix deadlock between AMS and EphemeralResolverConnection" into oc-mr1-dev
authorTodd Kennedy <toddke@google.com>
Wed, 2 Aug 2017 15:16:23 +0000 (15:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 2 Aug 2017 15:16:23 +0000 (15:16 +0000)
am: a3735dc42e

Change-Id: I9698b051ffd874692476419bfd7a4bb115ec6ef7


Trivial merge