tree b01e43ae64cbb4d429dda8b3fc190462d6a0e4b2
parent 0efd29fc57c7369e2371aa3226e90f97331f517a
parent 5b8c5dd41e386e696d7e8705f84982a91d1596ae
author Jeff Davidson <jpd@google.com> 1418067406 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418067406 +0000

am 5b8c5dd4: am 699faa1d: Merge "Show "Connected via Wi-Fi assistant" for ephemeral networks." into lmp-mr1-dev

* commit '5b8c5dd41e386e696d7e8705f84982a91d1596ae':
  Show "Connected via Wi-Fi assistant" for ephemeral networks.