am 54f5ecc6: am 9127d9a5: am be348964: Merge "Move Tethering off the ServerThread." into froyo