Merge "Change text for data warning and data limit." into pi-dev

author Sundeep Ghuman <sghuman@google.com>

Thu, 15 Mar 2018 17:08:34 +0000 (17:08 +0000)

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

Thu, 15 Mar 2018 17:08:34 +0000 (17:08 +0000)
author Sundeep Ghuman <sghuman@google.com>
Thu, 15 Mar 2018 17:08:34 +0000 (17:08 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 15 Mar 2018 17:08:34 +0000 (17:08 +0000)
diff --cc res/values/strings.xml
Simple merge
diff --cc src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
Simple merge
author	Sundeep Ghuman <sghuman@google.com>
	Thu, 15 Mar 2018 17:08:34 +0000 (17:08 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 15 Mar 2018 17:08:34 +0000 (17:08 +0000)
		1	2
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java	patch \|	diff1 \|	diff2 \|	blob \| history