Merge "support limited sim function notification under dsds" into qt-r1-dev

author Chen Xu <fionaxu@google.com>

Mon, 29 Jul 2019 18:22:56 +0000 (18:22 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Mon, 29 Jul 2019 18:22:56 +0000 (18:22 +0000)
author Chen Xu <fionaxu@google.com>
Mon, 29 Jul 2019 18:22:56 +0000 (18:22 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 29 Jul 2019 18:22:56 +0000 (18:22 +0000)
diff --cc core/res/res/values/strings.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
diff --cc telephony/java/android/telephony/CarrierConfigManager.java
Simple merge
author	Chen Xu <fionaxu@google.com>
	Mon, 29 Jul 2019 18:22:56 +0000 (18:22 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 29 Jul 2019 18:22:56 +0000 (18:22 +0000)
		1	2
core/res/res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/symbols.xml	patch \|	diff1 \|	diff2 \|	blob \| history
telephony/java/android/telephony/CarrierConfigManager.java	patch \|	diff1 \|	diff2 \|	blob \| history