am 7c5c6076: Merge change 26640 into eclair
am 7c5c6076: Merge change 26640 into eclair

Merge commit '7c5c6076ea5d02aabbb449b1341ec44d184d1316' into eclair-plus-aosp

* commit '7c5c6076ea5d02aabbb449b1341ec44d184d1316':
  Support IPv6 literal URLs, e.g., http://[2001:4860:b004::68]/ as per RFC 3896

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base