| commit | 4bcd2b139cdb67cfcea47d15b58f38afec0b0859 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Thu Oct 09 22:07:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 09 22:07:03 2014 +0000 |
| tree | 551acbe6cd529cc0f13c036822986da3c8586c9b | |
| parent | 4dc100c4e79200152ab5c0f9bc3e00033bfff104 [diff] | |
| parent | 388cd671ff5237aabcd728794af49d33e18fda8b [diff] |
am 388cd671: (-s ours) Merge "Fix MDnsSdListener::Monitor::Monitor()" * commit '388cd671ff5237aabcd728794af49d33e18fda8b': Fix MDnsSdListener::Monitor::Monitor()