commit | cfe22215dee1799c1c122bc2080d415edd25187d | [log] [tgz] |
---|---|---|
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Fri Apr 08 23:29:04 2022 +0000 |
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Fri Apr 08 23:29:04 2022 +0000 |
tree | b62f1c71e861d46be53bef900a08da73cf4e4adc | |
parent | faef22db27027c5a14e79ee060d11f84b3035e05 [diff] | |
parent | 70dbc143dd9a83d1ac3b96ab3f475bd521dda64c [diff] |
Merge cherrypicks of [17605115, 17625394] into security-aosp-qt-release. Change-Id: I7078fec450ee0f42795ac744df5ef7b6c7b2d367