| commit | 8c16dfac1ac3b96425a335e6f587815241420d3e | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Tue Apr 13 17:59:56 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 13 17:59:56 2010 -0700 |
| tree | 3e5f86120f1ff365c1753580da989ae35d07c503 | |
| parent | de2f3005b12c5c19e8809e9f6a02ff3ea62e9d08 [diff] | |
| parent | 9f734957142805c0b595491369f1639afd4c9ac5 [diff] |
am ae8c2c71: Merge "Fix issue #2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard..." into froyo Merge commit 'ae8c2c71f7791ed0321e56f31f0c1276da4d8842' into froyo-plus-aosp * commit 'ae8c2c71f7791ed0321e56f31f0c1276da4d8842': Fix issue #2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard...