| commit | 1327cdc53de0d557bddeac8dabd07a2d197def3b | [log] [tgz] |
|---|---|---|
| author | Bryce Lee <brycelee@google.com> | Fri Aug 18 21:33:46 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Aug 18 21:33:46 2017 +0000 |
| tree | e5f475525a88b217d706120ddf53a4d265651624 | |
| parent | edda7ebdd98676e503d44a98b18756d28e484290 [diff] | |
| parent | 8558ec7dbe7733a36b621b24309e7a9dd9deec8c [diff] |
Merge "Don't resume activity if user is locked and encryption is unsupported" into oc-mr1-dev