| commit | bde25c207731783a62e3611586fe05cd35add0d9 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Mon Jun 07 19:24:45 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jun 07 19:24:45 2010 -0700 |
| tree | 402adb4327f1f1e768d663487c4e6f32b5c32eed | |
| parent | ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a [diff] | |
| parent | d6b5705e188e55a3b9dbb07954b16564b1a31b9f [diff] |
Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo