| commit | 5708d4f9a81c6bc94e691b8805fb8dfd0f9b7095 | [log] [tgz] |
|---|---|---|
| author | Karsten Tausche <karsten@fairphone.com> | Thu Dec 09 15:18:56 2021 +0100 |
| committer | Karsten Tausche <karsten@fairphone.com> | Thu Dec 09 15:18:56 2021 +0100 |
| tree | 21fd52dd58de31c3b96c8f5edf3ff5feddab7eb8 | |
| parent | 0dac0e4ed20a13bb90ea4d87865884078c0d3945 [diff] | |
| parent | e2f3f19e8d31d6cf7b7cb5aaec610bcc6fdefcab [diff] |
Merge tag 'android-security-11.0.0_r49' into int/11/fp3 Android security 11.0.0 release 49 * tag 'android-security-11.0.0_r49': resolve merge conflicts of 26957fb8e6b761837a499431d79ffcc7b4be9af4 to rvc-dev Change-Id: Ib891a2c6b43ab4272ab567ce21df8b8dee56504d