OSDN Git Service

am 4bcd2b13: am 388cd671: (-s ours) Merge "Fix MDnsSdListener::Monitor::Monitor()"
authorRobert Greenwalt <rgreenwalt@google.com>
Wed, 29 Oct 2014 07:00:21 +0000 (07:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Oct 2014 07:00:21 +0000 (07:00 +0000)
commit3d6c5b01355a10469ac10538bea365ec34e8e23f
treeb16b0719cd09fdf4ea417aba2391fb3f8ac8a104
parent50b90a07f68335492a34e0e85a69413ea22cc43e
parent4bcd2b139cdb67cfcea47d15b58f38afec0b0859
am 4bcd2b13: am 388cd671: (-s ours) Merge "Fix MDnsSdListener::Monitor::Monitor()"

* commit '4bcd2b139cdb67cfcea47d15b58f38afec0b0859':