summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Kershaw <alexkershaw@google.com>2019-02-25 16:14:59 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-02-25 16:14:59 -0800
commit8145937e2f543e429c22e2f5b3babd68e2ba5951 (patch)
tree95e5aedaf75b78d71fa601382d433d153723f6d0
parent7c049a3a390b2933dab5f5ffcf072b99d314929f (diff)
parentd591e977d8b0ca13d90132336fa8e1929e03b214 (diff)
downloadcts-8145937e2f543e429c22e2f5b3babd68e2ba5951.tar.gz
Merge "resolve merge conflicts of bc207768af3049bcefab4e96a5de96abfdc53099 to oreo-cts-dev" into oreo-cts-dev am: 8c3d859dca
am: d591e977d8 Change-Id: Ie38d1971dc963960fad451d1ef65688c8699d821
-rwxr-xr-xapps/CtsVerifier/res/values/strings.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/apps/CtsVerifier/res/values/strings.xml b/apps/CtsVerifier/res/values/strings.xml
index 6d44ecd0b57..0fbaf31f7ab 100755
--- a/apps/CtsVerifier/res/values/strings.xml
+++ b/apps/CtsVerifier/res/values/strings.xml
@@ -2263,6 +2263,7 @@ You should be prompted to select credentials; choose the ones you just installed
\n
Navigate to \"Data usage\" page and then into the \"Wi-Fi data usage\" category.\n
Confirm that \"All work apps\" section is present and that it is possible to see the data usage for work (badged) apps.\n
+ (If the section is not present, this might be because work apps have not used Wi-Fi data yet. Ensure that you have used Wi-Fi data on a work app, then repeat these instructions.)\n
\n
Then use the Back button (or navigate back to this app using Recents) to return to this test and mark accordingly.
</string>