commit | cc2831749822e3f722daccf245f98ce6cada94fb | [log] [tgz] |
---|---|---|
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Fri Jul 14 17:33:17 2023 +0000 |
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Fri Jul 14 17:33:17 2023 +0000 |
tree | 2b626b9b9839ca477ffce63496e52dce599af202 | |
parent | 192c7711c1adc835c06720d59ddacb86c5e32b5f [diff] | |
parent | db3c69afcb0a45c8aa2f333fcde36217889899fe [diff] |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/23764854', 'googleplex-android-review.googlesource.com/23916075'] into security-aosp-tm-release. Change-Id: Ifa54765e4ef827bef923d1f33f595e78a57e5cdd