tree be4b3c27a5ae00b1458ef8db06f5fb5e25a54b2a
parent f657463a500e90acb2fa9991cd67629199ef7ab4
parent c452bac6fc100bf30d4ddde5b4e008dd862750e5
author Jeff Davidson <jpd@google.com> 1417045976 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417045976 +0000

am c452bac6: am 3caf0f8e: Merge "Add string for "Connected via Wi-Fi assistant"." into lmp-mr1-dev

* commit 'c452bac6fc100bf30d4ddde5b4e008dd862750e5':
  Add string for "Connected via Wi-Fi assistant".