tree 6d130a6508234fa9bb680f796dbe77c113703c05
parent 97e39a4abc8ede67ff7226f82453c969f133468a
parent 845b9dd8b54ead28f15032639acb834bdbc8baa5
author Daniel Xie <dxie@google.com> 1442956575 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442956575 +0000

am 845b9dd8: am 1688da2a: am f7c56078: am 54fa0bd3: am 981e1071: am 4755b246: am 30ee954e: am f056ab50: am f5c48b8e: am 760b6d86: am f6915b6f: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f

* commit '845b9dd8b54ead28f15032639acb834bdbc8baa5':