Merge "Fix NPE in trimV4AddrZeros." into ics-mr1

Author: Robert Greenwalt

core/java/android/net/NetworkUtils.java

@@ -261,6 +261,7 @@ public static String[] makeStrings(Collection<InetAddress> addrs) {
      * @return a string propertly trimmed
      */
     public static String trimV4AddrZeros(String addr) {
+        if (addr == null) return null;
         String[] octets = addr.split("\\.");
         if (octets.length != 4) return addr;
         StringBuilder builder = new StringBuilder(16);