Merge "initial value for data_roaming based on carrier"

author Chen Xu <fionaxu@google.com>

Wed, 9 Aug 2017 01:19:24 +0000 (01:19 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Wed, 9 Aug 2017 01:19:24 +0000 (01:19 +0000)
author Chen Xu <fionaxu@google.com>
Wed, 9 Aug 2017 01:19:24 +0000 (01:19 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 9 Aug 2017 01:19:24 +0000 (01:19 +0000)
diff --cc telephony/java/android/telephony/CarrierConfigManager.java
Simple merge
author	Chen Xu <fionaxu@google.com>
	Wed, 9 Aug 2017 01:19:24 +0000 (01:19 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Wed, 9 Aug 2017 01:19:24 +0000 (01:19 +0000)