Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clean up config of tabs and trailing whitespace" am: a4c1416c28

Browse Source 
am: 70491b73d2

Change-Id: Ic74b4c4c8093da3aeaabebf9bead792ea543bc4f
This commit is contained in:
Chalard Jean
2019-01-21 12:11:13 -08:00
committed by android-build-merger
parent ed9f1140d1 70491b73d2
commit c98c67a0c1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/res/res/values/config.xml
View File

@@ -378,8 +378,8 @@
Values must be from NetworkCapabilities#NET_CAPABILITIES_* constants. Values must be from NetworkCapabilities#NET_CAPABILITIES_* constants.
[IP config] Optional. If empty or not specified - DHCP will be used, otherwise [IP config] Optional. If empty or not specified - DHCP will be used, otherwise
use the following format to specify static IP configuration: use the following format to specify static IP configuration:
ip=<ip-address/mask> gateway=<ip-address> dns=<comma-sep-ip-addresses> ip=<ip-address/mask> gateway=<ip-address> dns=<comma-sep-ip-addresses>
domains=<comma-sep-domains> domains=<comma-sep-domains>
--> -->
<string-array translatable="false" name="config_ethernet_interfaces"> <string-array translatable="false" name="config_ethernet_interfaces">
<!-- <!--