commit 127634f06155d0d5ee5870c87ecdb5dbfff91ff9
author Daniel Xie <dxie@google.com> Fri Feb 12 16:42:10 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 12 16:42:10 2016 +0000
tree 4333191295a35e89089017fd99a1d573e9055847
parent a2179af903bc9b97a8160ec2943bafca292cd276
parent bcc1dabc4817b811b9e9ef3dea7a9dab717f2809

Merge "Fix cts verifier crash when test Policy Serialization Test" into marshmallow-cts-dev am: a9df99be8a am: 49c8e36170
am: bcc1dabc48

* commit 'bcc1dabc4817b811b9e9ef3dea7a9dab717f2809':
  Fix cts verifier crash when test Policy Serialization Test

apps/CtsVerifier/res/xml/device_admin_byod.xml

diff --git a/apps/CtsVerifier/res/xml/device_admin_byod.xml b/apps/CtsVerifier/res/xml/device_admin_byod.xml
index ce44794..ff1eb95 100644
--- a/apps/CtsVerifier/res/xml/device_admin_byod.xml
+++ b/apps/CtsVerifier/res/xml/device_admin_byod.xml
@@ -17,6 +17,8 @@
 <!-- BEGIN_INCLUDE(meta_data) -->
 <device-admin xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-policies>
+        <limit-password />
+        <watch-login />
         <encrypted-storage />
         <wipe-data />
         <reset-password />