| commit | ec36c2401d4471a819d6b32df3da7245fd7db7d8 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Wed Nov 12 03:45:01 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 12 03:45:01 2014 +0000 |
| tree | 7db5d10e0ed0633eacbfd6688d15578659a29411 | |
| parent | b31ac7e17fc8dd03fa52e7813cda4dde1302a6b2 [diff] | |
| parent | b39f5510f4285f10e9071987eb2d484e0ff4a58b [diff] |
am b39f5510: Show error dialogs over apps that dismiss keyguard automerge: c08eab8 automerge: 2b9e9f4 * commit 'b39f5510f4285f10e9071987eb2d484e0ff4a58b': Show error dialogs over apps that dismiss keyguard