tree 8116422466831cccd4d381864e5559dce9337047
parent b50470fcea5b6dffe6263bb651aa3a8c6496aae4
parent 9417d7288ddd37b5d2e347a724afb76cf987f70f
author Daniel Xie <dxie@google.com> 1438837887 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438837887 +0000

am 9417d728: am ea9003d9: am 2b44bd54: am 42445696: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f automerge: f6915b6

* commit '9417d7288ddd37b5d2e347a724afb76cf987f70f':
  Support WiFi only device at runtime.