diff options
| author | Jim Miller <jaggies@google.com> | 2010-06-07 19:28:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-07 19:28:08 -0700 |
| commit | a9a0a0b29809447513a1acbf7672bedcec22999b (patch) | |
| tree | cf625de11e2f756239996ca71331dae86ba71778 /docs/html/sdk/api_diff/4/changes | |
| parent | 40c20b06ba7d152ef668b9bf75986d35a217e67c (diff) | |
| parent | 7d70358a039426ca2da53cd3330638e2b12ca92e (diff) | |
am 7d70358a: am bde25c20: Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo
Diffstat (limited to 'docs/html/sdk/api_diff/4/changes')
0 files changed, 0 insertions, 0 deletions