Commit 10397bfd authored Jan 25, 2012 by Robert Greenwalt Committed by Android Git Automerger Jan 25, 2012

am afacb33f: Merge "resolved conflicts for merge of 67cda1a0 to master"

* commit 'afacb33f7584ca2f762c2d15472917059c0e9503':
  Use the carrier-given dns addrs for tethering.

There are no changes