commit 469465c45e42c66201639feb49db5421f5843bbe
author Dianne Hackborn <hackbod@google.com> Thu May 26 14:14:41 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu May 26 14:14:41 2011 -0700
tree d12444e21ffb3c0e15eaf8e910b926e4d71b2faa
parent 76450622f08b1d0d09df7f1ad8e52afe01090770
parent 0821f2745d05af98195c9c1c7889ca14e9c56e0b

am 0821f274: am 2a108403: I am a dummy.

* commit '0821f2745d05af98195c9c1c7889ca14e9c56e0b':
  I am a dummy.

services/java/com/android/server/DevicePolicyManagerService.java

diff --git a/services/java/com/android/server/DevicePolicyManagerService.java b/services/java/com/android/server/DevicePolicyManagerService.java
index 92d76be..3bd8215 100644
--- a/services/java/com/android/server/DevicePolicyManagerService.java
+++ b/services/java/com/android/server/DevicePolicyManagerService.java
@@ -148,7 +148,7 @@
         int minimumPasswordLowerCase = DEF_MINIMUM_PASSWORD_LOWER_CASE;
 
         static final int DEF_MINIMUM_PASSWORD_LETTERS = 1;
-        int minimumPasswordLetters = DEF_MINIMUM_PASSWORD_LOWER_CASE;
+        int minimumPasswordLetters = DEF_MINIMUM_PASSWORD_LETTERS;
 
         static final int DEF_MINIMUM_PASSWORD_NUMERIC = 1;
         int minimumPasswordNumeric = DEF_MINIMUM_PASSWORD_NUMERIC;