commit | fc9451e35502f64679f070c20542c387afa03cbd | [log] [tgz] |
---|---|---|
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 22 12:22:55 2022 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jun 22 12:22:55 2022 +0000 |
tree | 5501ec7520eba60027c7cd4813dedfd84cf16401 | |
parent | 9552bc10c36a3be6af32890fed435d7054a6bc06 [diff] | |
parent | 771d5ec85718f93f11ef22183507fdf7591f0ee3 [diff] |
Merge changes from topic "am-4bed95e59dd747a883d051bbbfa99fd5" into tm-d1-dev-plus-aosp * changes: [automerger skipped] Merge "Skip cts testFirewallBlocking in instant mode." into tm-dev am: fac4f05be7 -s ours am: 0bb5b26d50 -s ours [automerger skipped] Skip cts testFirewallBlocking in instant mode. am: 896472ff53 -s ours am: cf0a3cb29a -s ours