tree c76e62b22167f31bdcb6964bfffc69272981b7a1
parent 317c602f0e03dd219c39495999049f853132feff
parent e2d76fa8c6d0f5c3d1a73a3ec9756c4bc545806d
author Jeff Sharkey <jsharkey@android.com> 1378945409 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378945409 -0700

am e2d76fa8: am cecccecc: Merge changes Ib1274847,I2eb2a1bf into klp-dev

* commit 'e2d76fa8c6d0f5c3d1a73a3ec9756c4bc545806d':
  Fix SDK build.
  Request all tethering interfaces, fix corruption.