commit | cbc771f50e998ec307c7e92009425c730cde49c5 | [log] [tgz] |
---|---|---|
author | Craig Mautner <cmautner@google.com> | Fri Sep 12 01:45:27 2014 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Sep 12 01:45:29 2014 +0000 |
tree | 16ab88dd394d3c3731dc83ae82f13cb2b55253e8 | |
parent | 3bab7c188d5e823484eda5c0f3df7759ce4a6c98 [diff] | |
parent | 7d7808fcf8e6a1c27d52375210f9da2705d5f590 [diff] |
Merge changes Ia6fe9724,I682b9acb into lmp-dev * changes: Show all windows from activity that hides keyguard Make sure FLAG_DISMISS_KEYGUARD brings up bouncer