tree 3a2dc36bc6652f9592fa077aba710bfc41767511
parent 4544716d2db7f41209cc6631a7be619326d31497
parent aa87b6d1ce1ae0cc0db88b6a5bee8e857c0803af
author Daniel Xie <dxie@google.com> 1442352664 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442352664 +0000

am aa87b6d1: am f4efe327: am e260657a: am 45643db7: am 03786bc4: am 545427fc: Merge "Support WiFi only device at runtime." into kitkat-cts-dev

* commit 'aa87b6d1ce1ae0cc0db88b6a5bee8e857c0803af':