tree 7ed1e5c4cbce62e5bca4103e4b76c8fbac5d2e67
parent 4c38e93e2067c8a0219865c0d5a10f5a66809d8c
parent 760b6d86ca79029a2a97ca81c97caee035e72cb1
author Daniel Xie <dxie@google.com> 1442893975 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442893975 +0000

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

* commit '760b6d86ca79029a2a97ca81c97caee035e72cb1':