commit 9292d2a6984a1bb666f8ad31bbf84ca9c39cebce
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu Dec 07 16:58:15 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 07 16:58:15 2017 +0000
tree f5ceaced2fd201a1ff8d89244540461b3ea987e1
parent 5d8632e1154cf3ce020c607d59e09af4916bb475
parent c3a1e1c3cc1fde691412a5942acc2c98db52769b

Merge changes from topic "am-273019da1a614490a6411173dbdc66ec"

* changes:
  Merge changes from topic "n" into nougat-cts-dev am: 4562872b9f am: ad91b75d2a am: 49f74f5104 am: a21e60d355 am: bdee27ac37 am: 71ffe5662d am: 70e8cb28c8 am: cffe44e287 am: 7146749bef am: e70e48dcd9
  DO NOT MERGE: CTS test for fix of b/65717533 am: 50d956befd  -s ours am: 3d30b87e48 am: 3ede4c2885 am: eb68dd826a am: 6a06c1c9b5 am: a4471a9996  -s ours am: bd56cc0f25 am: ae516797f3 am: b3c3a48908 am: 37a212ba01  -s ours

apps/CtsVerifier/res/values/strings.xml

diff --git a/apps/CtsVerifier/res/values/strings.xml b/apps/CtsVerifier/res/values/strings.xml
index 77943cb..e9f29b8 100755
--- a/apps/CtsVerifier/res/values/strings.xml
+++ b/apps/CtsVerifier/res/values/strings.xml
@@ -1907,7 +1907,8 @@
         This test verifies that if a work profile is locked with a separate password, Recents views
         for applications in the work profile are redacted.\n
         Some devices may not lock as soon as the screen is turned off by default. On such devices,
-        use the button below when requested to lock the work profile.
+        use the button below when requested to lock the work profile. Please skip these tests if
+        "Recents" is absent.
     </string>
     <string name="provisioning_byod_recents_lock_now">Lock now</string>