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

Merge commit '4d5cd955423a6b0cb54c9e3030f4415db3e0b1e0'

* commit '4d5cd955423a6b0cb54c9e3030f4415db3e0b1e0':
  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