Kenny Root c4af47ebf9 resolved conflicts for merge of e96a8207 to master ...

Change-Id: I90801b35ed0c00078a47faadc7fbb05d2e5fe381

2013-06-10 11:09:28 -07:00

..

net

Start combining threads in system process.

2013-05-02 17:42:40 -07:00

INativeDaemonConnectorCallbacks.java

services: Introduce NativeDaemonConnector class

2010-01-12 13:55:39 -08:00

NativeDaemonConnector.java

resolved conflicts for merge of e96a8207 to master

2013-06-10 11:09:28 -07:00

NativeDaemonConnectorException.java

Move NativeDaemonConnector to varargs.

2011-11-29 12:09:06 -08:00

NativeDaemonEvent.java

return value of String.replace() is ignored.

2012-10-28 23:57:57 +09:00

NsdService.java

Merge "NsdService: Clear client info after resolution request is serviced."

2012-12-20 14:43:17 -08:00