am 37c5cd6e: Merge "Fix the build."

* commit '37c5cd6ee960804afa9a78910f1d3a7bd1963a78':
  Fix the build.
This commit is contained in:
Jim Miller
2011-09-02 19:46:34 -07:00
committed by Android Git Automerger

View File

@@ -4032,6 +4032,7 @@ package android.app.admin {
field public static final java.lang.String EXTRA_DEVICE_ADMIN = "android.app.extra.DEVICE_ADMIN";
field public static final int PASSWORD_QUALITY_ALPHABETIC = 262144; // 0x40000
field public static final int PASSWORD_QUALITY_ALPHANUMERIC = 327680; // 0x50000
field public static final int PASSWORD_QUALITY_BIOMETRIC_WEAK = 32768; // 0x8000
field public static final int PASSWORD_QUALITY_COMPLEX = 393216; // 0x60000
field public static final int PASSWORD_QUALITY_NUMERIC = 131072; // 0x20000
field public static final int PASSWORD_QUALITY_SOMETHING = 65536; // 0x10000