Merge "Adding Dynamic ImsService Binding (1/3)" am: 8e6b13a1c0

author Brad Ebinger <breadley@google.com>

Thu, 26 Jan 2017 01:46:06 +0000 (01:46 +0000)

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

Thu, 26 Jan 2017 01:46:06 +0000 (01:46 +0000)
author Brad Ebinger <breadley@google.com>
Thu, 26 Jan 2017 01:46:06 +0000 (01:46 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 26 Jan 2017 01:46:06 +0000 (01:46 +0000)
diff --cc Android.mk
Simple merge
diff --cc core/res/AndroidManifest.xml
Simple merge
diff --cc telephony/java/android/telephony/CarrierConfigManager.java
Simple merge
author	Brad Ebinger <breadley@google.com>
	Thu, 26 Jan 2017 01:46:06 +0000 (01:46 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 26 Jan 2017 01:46:06 +0000 (01:46 +0000)
		1	2
Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
telephony/java/android/telephony/CarrierConfigManager.java	patch \|	diff1 \|	diff2 \|	blob \| history