tree 65c394a64a6de69e771bc300370213a867d64ae5
parent 92e03a787a89155c3e484a9a48c3b0a8f3381d74
parent 89ab67578e4e06c41f0e96d840de952d10895233
author Robert Greenwalt <rgreenwalt@google.com> 1345236294 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345236294 -0700

am 89ab6757: (-s ours) am 6626398a: Merge "Fix for updating TCP buffer size when switching network type"

* commit '89ab67578e4e06c41f0e96d840de952d10895233':
  Fix for updating TCP buffer size when switching network type