commit a82e1b8799351e42111a75921eb6aacdb16134f9
author Clay Murphy <claym@google.com> Mon Jan 13 14:54:21 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Jan 13 14:54:21 2014 -0800
tree b5d15956e8626d996c825136a7d4d92086eeca8c
parent a0751c2e8cc2534a34f78fed5ec1e2bc10d62ae6
parent 68ac1f1efcf5cdc68fc27e8a30725a6d69a7615b

am 68ac1f1e: Merge "Docs: Adding note about CtsDeviceAdminDeactivated Bug: 12084920"

* commit '68ac1f1efcf5cdc68fc27e8a30725a6d69a7615b':
  Docs: Adding note about CtsDeviceAdminDeactivated Bug: 12084920

src/compatibility/cts-intro.jd

diff --git a/src/compatibility/cts-intro.jd b/src/compatibility/cts-intro.jd
index 6732606..a627eb2 100644
--- a/src/compatibility/cts-intro.jd
+++ b/src/compatibility/cts-intro.jd
@@ -62,6 +62,8 @@
 </li>
 <li>
 <p>On the device, enable the two android.deviceadmin.cts.CtsDeviceAdminReceiver* device administrators under Settings &gt; Location &amp; security &gt; Select device administrators</p>
+<p><strong>Note</strong>: Make sure the android.deviceadmin.cts.CtsDeviceAdminDeactivatedReceiver
+stays disabled in the same menu.</p>
 </li>
 </ol>
 </li>