| commit | 91874c12e29e6e3e3efe00d5ff81829a36c985ca | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Tue Jun 08 16:33:22 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 08 16:33:22 2010 -0700 |
| tree | 2e6c7cfa32c293f7fd4aa65eb772567fe6465e65 | |
| parent | 57e32fb1cef99fb8b1359b90a0aeff77a66be6d1 [diff] | |
| parent | 5ca447aa0c63a20bf1e121f0a54bbd1a46ccf27d [diff] |
am 75b6a6b9: Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo Merge commit '75b6a6b972e6b18143fd629d3d9c824c442c5f4c' into froyo-plus-aosp * commit '75b6a6b972e6b18143fd629d3d9c824c442c5f4c': Fix 2737842: Disable KeguardManager API if device policy is enabled