Merge "Add API to set alwaysAllowMms" into qt-dev

author Xiangyu/Malcolm Chen <refuhoo@google.com>

Wed, 17 Apr 2019 17:14:55 +0000 (17:14 +0000)

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

Wed, 17 Apr 2019 17:14:55 +0000 (17:14 +0000)
author Xiangyu/Malcolm Chen <refuhoo@google.com>
Wed, 17 Apr 2019 17:14:55 +0000 (17:14 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 17 Apr 2019 17:14:55 +0000 (17:14 +0000)
diff --cc telephony/java/android/telephony/SubscriptionManager.java
Simple merge
diff --cc telephony/java/android/telephony/TelephonyManager.java
Simple merge
diff --cc telephony/java/com/android/internal/telephony/ISub.aidl
Simple merge
author	Xiangyu/Malcolm Chen <refuhoo@google.com>
	Wed, 17 Apr 2019 17:14:55 +0000 (17:14 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 17 Apr 2019 17:14:55 +0000 (17:14 +0000)
		1	2
telephony/java/android/telephony/SubscriptionManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
telephony/java/android/telephony/TelephonyManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
telephony/java/com/android/internal/telephony/ISub.aidl	patch \|	diff1 \|	diff2 \|	blob \| history