tree 3a2dc36bc6652f9592fa077aba710bfc41767511
parent 7e32f6e8c071cea40b4cae9a11d591c052602abe
parent f5c48b8e6f92717d82b2478bcaf685c67953ad98
author Daniel Xie <dxie@google.com> 1442940526 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442940526 +0000

am f5c48b8e: am 760b6d86: am f6915b6f: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f

* commit 'f5c48b8e6f92717d82b2478bcaf685c67953ad98':