RadioInfo network mode list and network mode string add 5G am: ec384c2f6f

author SongFerngWang <songferngwang@google.com>

Sun, 6 Oct 2019 16:25:58 +0000 (09:25 -0700)

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

Sun, 6 Oct 2019 16:25:58 +0000 (09:25 -0700)
author SongFerngWang <songferngwang@google.com>
Sun, 6 Oct 2019 16:25:58 +0000 (09:25 -0700)
committer android-build-merger <android-build-merger@google.com>
Sun, 6 Oct 2019 16:25:58 +0000 (09:25 -0700)
diff --cc res/values/arrays.xml
Simple merge
diff --cc res/values/strings.xml
Simple merge
diff --cc src/com/android/settings/RadioInfo.java
Simple merge
author	SongFerngWang <songferngwang@google.com>
	Sun, 6 Oct 2019 16:25:58 +0000 (09:25 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Sun, 6 Oct 2019 16:25:58 +0000 (09:25 -0700)
		1	2
res/values/arrays.xml	patch \|	diff1 \|	diff2 \|	blob \| history
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/RadioInfo.java	patch \|	diff1 \|	diff2 \|	blob \| history