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".
This commit is contained in:
Jeff Davidson
2014-11-26 23:52:56 +00:00
committed by Android Git Automerger

View File

@@ -628,6 +628,8 @@
<string name="quick_settings_done">Done</string>
<!-- QuickSettings: Control panel: Label for connected device. [CHAR LIMIT=NONE] -->
<string name="quick_settings_connected">Connected</string>
<!-- QuickSettings: Control panel: Label for a connected Wi-Fi access point when the connection is established by a Wi-Fi assistant application. [CHAR LIMIT=NONE] -->
<string name="quick_settings_connected_via_wfa">Connected via Wi\u2011Fi assistant</string>
<!-- QuickSettings: Control panel: Label for connecting device. [CHAR LIMIT=NONE] -->
<string name="quick_settings_connecting">Connecting...</string>
<!-- QuickSettings: Tethering. [CHAR LIMIT=NONE] -->