tree dbd1db7a8308c02bf5de54329924ea21ae27dfa6
parent 386effc7a160e330420f7746f41d46c12f64579d
parent 699faa1d8c4ce55bf664ce122ff3fd80acd6b2f7
author Jeff Davidson <jpd@google.com> 1417831854 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417831854 +0000

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

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