Merge remote branch 'goog/gingerbread' into honeycomb

Conflicts:
	apps/CtsVerifier/AndroidManifest.xml
	tests/tests/app/src/android/app/cts/DownloadManagerTest.java

Change-Id: I16c2d14484dea54d89c3ccb105e2dfacace1f9e1
diff --git a/tests/cts/net/src/android/net/cts/ListeningPortsTest.java b/tests/cts/net/src/android/net/cts/ListeningPortsTest.java
index b6e6efb..5c1ba7c 100644
--- a/tests/cts/net/src/android/net/cts/ListeningPortsTest.java
+++ b/tests/cts/net/src/android/net/cts/ListeningPortsTest.java
@@ -118,13 +118,18 @@
 
                 String localAddress = fields[1];
                 String state = fields[3];
+                String uid = fields[7];
 
                 assertTrue(procFilePath + " should have an IP address in the second column",
                         isAddress(localAddress));
 
+                String localIp = localAddress.split(":")[0];
+                int localPort = Integer.parseInt(localAddress.split(":")[1], 16);
+
                 if (!isException(localAddress) && isPortListening(state, isTcp)) {
                     throw new ListeningPortsAssertionError(
-                            "Found port listening on " + localAddress + " in " + procFilePath);
+                            "Found port listening on addr=" + localIp + ", port="
+                                + localPort + ", UID=" + uid + " in " + procFilePath);
                 }
             }
         } catch (FileNotFoundException notFound) {