Merge "Prefer default Internet network for upstream tethering." into pi-dev am: 1e163...

author Erik Kline <ek@google.com>

Wed, 20 Jun 2018 08:32:10 +0000 (01:32 -0700)

committer android-build-merger <android-build-merger@google.com>

Wed, 20 Jun 2018 08:32:10 +0000 (01:32 -0700)
author Erik Kline <ek@google.com>
Wed, 20 Jun 2018 08:32:10 +0000 (01:32 -0700)
committer android-build-merger <android-build-merger@google.com>
Wed, 20 Jun 2018 08:32:10 +0000 (01:32 -0700)
diff --cc core/res/res/values/config.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
author	Erik Kline <ek@google.com>
	Wed, 20 Jun 2018 08:32:10 +0000 (01:32 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 20 Jun 2018 08:32:10 +0000 (01:32 -0700)
		1	2
core/res/res/values/config.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/symbols.xml	patch \|	diff1 \|	diff2 \|	blob \| history