Merge "Add CarrierConfig to remove hold during Ims Calls" into nyc-mr1-dev

author Brad Ebinger <breadley@google.com>

Thu, 21 Jul 2016 18:40:42 +0000 (18:40 +0000)

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

Thu, 21 Jul 2016 18:40:43 +0000 (18:40 +0000)
author Brad Ebinger <breadley@google.com>
Thu, 21 Jul 2016 18:40:42 +0000 (18:40 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 21 Jul 2016 18:40:43 +0000 (18:40 +0000)
diff --cc telephony/java/android/telephony/CarrierConfigManager.java
Simple merge
author	Brad Ebinger <breadley@google.com>
	Thu, 21 Jul 2016 18:40:42 +0000 (18:40 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 21 Jul 2016 18:40:43 +0000 (18:40 +0000)