OSDN Git Service

am 8214b178: am 388cd671: (-s ours) Merge "Fix MDnsSdListener::Monitor::Monitor()"
authorRobert Greenwalt <rgreenwalt@google.com>
Thu, 9 Oct 2014 22:19:28 +0000 (22:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 9 Oct 2014 22:19:28 +0000 (22:19 +0000)
commite06a719785eaeaabf7be6630bdfc6d045db23684
treecb74774bb73fac6d3f257fef3fe6290be0fb542b
parent61549f775be116b4cb57a372c02cb90aca50ef73
parent8214b1782bb67d22629af35e34244f69adb80e02
am 8214b178: am 388cd671: (-s ours) Merge "Fix MDnsSdListener::Monitor::Monitor()"

* commit '8214b1782bb67d22629af35e34244f69adb80e02':
  Fix MDnsSdListener::Monitor::Monitor()