am e93bc70c: am dd4dd50f: Merge "Fix DNS hint in settings" into jb-mr1-dev

* commit 'e93bc70c00a9f916e7dce7c706eba9e91caee3c3':
  Fix DNS hint in settings
This commit is contained in:
Irfan Sheriff
2012-07-29 22:37:13 -07:00
committed by Android Git Automerger

View File

@@ -1411,7 +1411,7 @@
<!-- Label for the DNS (second one)-->
<string name="wifi_dns2">DNS 2</string>
<!-- Hint text for DNS -->
<string name="wifi_dns2_hint" translatable="false">4.4.4.4</string>
<string name="wifi_dns2_hint" translatable="false">8.8.4.4</string>
<!-- Label for the gateway of the network -->
<string name="wifi_gateway">Gateway</string>
<!-- Hint text for the gateway -->