tree 162aa76ce1ac88a2a386b0b826c5b850a869c82e
parent 6ee31d9567b367e562ef615eb30db5be9418e3b0
parent a8dfc9acfe032ac10e398c1e809e61a1b00d26e4
author Daniel Xie <dxie@google.com> 1442353152 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442353152 +0000

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

* commit 'a8dfc9acfe032ac10e398c1e809e61a1b00d26e4':