| commit | b72e6f6f30a27f1d5d04d7493976eff2224faee7 | [log] [tgz] |
|---|---|---|
| author | Maarten Derks <maarten@fairphone.com> | Mon Dec 13 15:24:27 2021 +0100 |
| committer | Maarten Derks <maarten@fairphone.com> | Mon Dec 13 15:24:27 2021 +0100 |
| tree | 591553abeddcff2fce3a3ca7a2104e805c64b49b | |
| parent | 80f823ee313eda960bc3102848c86bbf4006ab29 [diff] | |
| parent | 5991036b8d5bd3e45b05b6424f360cfe0a5c76a1 [diff] |
Merge branch 'security-aosp-qt-release' into int/10/fp2 * security-aosp-qt-release: DO NOT MERGE KeyChain protect against overlays. DO NOT MERGE Hide overlay on KeyChainActivity Change-Id: I9a52c0522c2259a9a15d2a24c310fc4ea1ffe697