Elliott Hughes fa024d1d0a resolved conflicts for merge of c9517611 to jb-mr2-dev-plus-aosp ...

Change-Id: I3349f8d2e6715171e2677c1385122ceb2810c1f6

2013-06-28 16:50:13 -07:00

..

net

am 1f8f2839: am ed3fba65: Merge "Avoid null mobile interfaces." into jb-mr1.1-dev

2012-12-03 11:40:23 -08:00

INativeDaemonConnectorCallbacks.java

services: Introduce NativeDaemonConnector class

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

NativeDaemonConnector.java

resolved conflicts for merge of c9517611 to jb-mr2-dev-plus-aosp

2013-06-28 16:50:13 -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