| commit | 381cbfc7c50de3b83b1aee75ac199a8f51031b81 | [log] [tgz] |
|---|---|---|
| author | Maarten Derks <maarten@fairphone.com> | Tue Jul 19 10:24:45 2022 +0200 |
| committer | Maarten Derks <maarten@fairphone.com> | Tue Jul 19 10:24:45 2022 +0200 |
| tree | 00c455620b25dc2a27562b4370082091aa9956c7 | |
| parent | bfa245017d21aed85f87d555d563f3cb32aaaaa2 [diff] | |
| parent | 59bd0175b6b2f26c54d83ddc33e6f9897b4b232a [diff] |
Merge branch 'dev/10/fp2/security-aosp-qt-release' into int/10/fp2 * dev/10/fp2/security-aosp-qt-release: RESTRICT AUTOMERGE SurfaceFlinger: fix a potential race condition in stealReceiveChannel Change-Id: I7cf272bbd98e63f4dd8222480533ce2371e91bc3