tree dc7a2376d1b713062dfe2e22081241f7ed455b70
parent 649329c3da31bd808b777c1bad83edf078f4d651
parent c354b89c761149ee0d3393f4f388e8416f52e963
author Jim Miller <jaggies@google.com> 1276039892 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1276039892 -0700

Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo