| commit | ae8c2c71f7791ed0321e56f31f0c1276da4d8842 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Tue Apr 13 17:57:23 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Apr 13 17:57:23 2010 -0700 |
| tree | a72083ae6bf148e4dd04adb3a84e55fda1d5d1bd | |
| parent | ba6339fe2ba2d7325a99201e82d951064efa31a2 [diff] | |
| parent | 5943c200a4707fb8acd38c1709e30c400b65349e [diff] |
Merge "Fix issue #2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard..." into froyo