Merge "Cleanup some debug in LinkCapabilities and Properties." into jb-mr2-dev

core/java/android/net/LinkCapabilities.java

@@ -314,8 +314,8 @@ public class LinkCapabilities implements Parcelable {
             sb.append(":\"");
             sb.append(entry.getValue());
             sb.append("\"");
-            return mCapabilities.toString();
         }
+        sb.append("}");
         return sb.toString();
     }
 

core/java/android/net/LinkProperties.java

@@ -290,7 +290,7 @@ public class LinkProperties implements Parcelable {
             }
             stacked += "] ";
         }
-        return ifaceName + linkAddresses + routes + dns + domainName + proxy + stacked;
+        return "{" + ifaceName + linkAddresses + routes + dns + domainName + proxy + stacked + "}";
     }
 
     /**