Improved mDNS response

This commit is contained in:
Andrew Hennessy
2013-11-04 14:19:09 -05:00
15 changed files with 1107 additions and 244 deletions

View File

@@ -35,8 +35,15 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
public static final int ic_launcher=0x7f020000;
}
public static final class id {
<<<<<<< HEAD
public static final int mDNSResultView=0x7f080000;
public static final int surfaceView=0x7f080001;
=======
public static final int hostTextView=0x7f080002;
public static final int pairButton=0x7f080000;
public static final int statusButton=0x7f080001;
public static final int surfaceView=0x7f080003;
>>>>>>> d7062ac2e0b306c42144c84690a3735c5878e11d
}
public static final class layout {
public static final int activity_connection=0x7f030000;