| commit | 5ca447aa0c63a20bf1e121f0a54bbd1a46ccf27d | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Tue Jun 08 16:31:32 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jun 08 16:31:32 2010 -0700 |
| tree | dc7a2376d1b713062dfe2e22081241f7ed455b70 | |
| parent | 649329c3da31bd808b777c1bad83edf078f4d651 [diff] | |
| parent | c354b89c761149ee0d3393f4f388e8416f52e963 [diff] |
Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo