tree 43f22e7a7fd63bb42dac1ca6b867b2b4a51c0655
parent 9cbac1fc0bb5e521e3e017542ca8b6477504fce7
parent 6cf73eadc752b619bc7c38d0d1277891eccbf81d
author Lorenzo Colitti <lorenzo@google.com> 1301531175 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1301531175 -0700

Merge "Kill IPv6 sockets as well as IPv4 sockets." into honeycomb-LTE