OSDN Git Service

am 3d6c5b01: am 4bcd2b13: am 388cd671: (-s ours) Merge "Fix MDnsSdListener::Monitor...
authorRobert Greenwalt <rgreenwalt@google.com>
Wed, 29 Oct 2014 07:12:48 +0000 (07:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Oct 2014 07:12:48 +0000 (07:12 +0000)
* commit '3d6c5b01355a10469ac10538bea365ec34e8e23f':


Trivial merge