Merge "Add support for notification of LTE to WIFI handover for video calls." into...

author Tyler Gunn <tgunn@google.com>

Thu, 11 Jan 2018 19:43:12 +0000 (19:43 +0000)

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

Thu, 11 Jan 2018 19:43:12 +0000 (19:43 +0000)
author Tyler Gunn <tgunn@google.com>
Thu, 11 Jan 2018 19:43:12 +0000 (19:43 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 11 Jan 2018 19:43:12 +0000 (19:43 +0000)
diff --cc telephony/java/android/telephony/CarrierConfigManager.java
Simple merge
author	Tyler Gunn <tgunn@google.com>
	Thu, 11 Jan 2018 19:43:12 +0000 (19:43 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 11 Jan 2018 19:43:12 +0000 (19:43 +0000)