Merge commit '4102af05a86aae36d2560fd8b3f740a52399342c' into HEAD

diff --cc rootdir/init.rc
index 0ef097c,01bef01..81d173a
--- 1/rootdir/init.rc
--- 2/rootdir/init.rc
+++ b/rootdir/init.rc
@@@ -372,15 -373,18 +377,18 @@@ on boo
      setprop net.tcp.buffersize.wifi     524288,1048576,2097152,262144,524288,1048576
      setprop net.tcp.buffersize.ethernet 524288,1048576,3145728,524288,1048576,2097152
      setprop net.tcp.buffersize.lte      524288,1048576,2097152,262144,524288,1048576
 -    setprop net.tcp.buffersize.umts     4094,87380,110208,4096,16384,110208
 -    setprop net.tcp.buffersize.hspa     4094,87380,262144,4096,16384,262144
 -    setprop net.tcp.buffersize.hsupa    4094,87380,262144,4096,16384,262144
 -    setprop net.tcp.buffersize.hsdpa    4094,87380,262144,4096,16384,262144
 -    setprop net.tcp.buffersize.hspap    4094,87380,1220608,4096,16384,1220608
 -    setprop net.tcp.buffersize.edge     4093,26280,35040,4096,16384,35040
 -    setprop net.tcp.buffersize.gprs     4092,8760,11680,4096,8760,11680
 +    setprop net.tcp.buffersize.umts     58254,349525,1048576,58254,349525,1048576
 +    setprop net.tcp.buffersize.hspa     40778,244668,734003,16777,100663,301990
 +    setprop net.tcp.buffersize.hsupa    40778,244668,734003,16777,100663,301990
 +    setprop net.tcp.buffersize.hsdpa    61167,367002,1101005,8738,52429,262114
 +    setprop net.tcp.buffersize.hspap    122334,734003,2202010,32040,192239,576717
 +    setprop net.tcp.buffersize.edge     4093,26280,70800,4096,16384,70800
 +    setprop net.tcp.buffersize.gprs     4092,8760,48000,4096,8760,48000
      setprop net.tcp.buffersize.evdo     4094,87380,262144,4096,16384,262144
  
+ # Define default initial receive window size in segments.
+     setprop net.tcp.default_init_rwnd 60
+ 
      class_start core
      class_start main