| commit | 26059959c982cb2286b3002dd7731f181c8fae98 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Fri Sep 12 07:26:32 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 12 07:26:32 2014 +0000 |
| tree | dff446cf8448c5c9f4c4021552a5a32b5b70ac29 | |
| parent | 0d6e0bfa7c96c12dcc8fc0886cfa8b38284bfa02 [diff] | |
| parent | cbc771f50e998ec307c7e92009425c730cde49c5 [diff] |
am 31632435: Merge changes Ia6fe9724,I682b9acb into lmp-dev * commit '31632435a5d994dc6e344186de31f19fdb08ca4e': Show all windows from activity that hides keyguard Make sure FLAG_DISMISS_KEYGUARD brings up bouncer