OSDN Git Service

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

Change-Id: I1d9e4b8d4aec4f9a81d5a0a4d0d520327321f79f


Trivial merge