| commit | 96a91f11c1f5783c673dc7486cea72c9728b9025 | [log] [tgz] |
|---|---|---|
| author | Bryce Lee <brycelee@google.com> | Fri Aug 18 21:55:35 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 18 21:55:35 2017 +0000 |
| tree | 77f045f124b2510bddab884b04053ce75f080a41 | |
| parent | 8ee6ecc1d0838a9f3bf8988eb0391b20fba374a5 [diff] | |
| parent | 004f9a3066bc1be589a6c98855ff1232f1c6c024 [diff] |
Merge "Don't resume activity if user is locked and encryption is unsupported" into oc-mr1-dev am: 1327cdc53d am: 004f9a3066 Change-Id: Ifcbb0d3fbde8f87052509d5ef0a0b57e013e2245