diff options
| author | Maciej Żenczykowski <maze@google.com> | 2023-10-18 10:12:20 -0700 |
|---|---|---|
| committer | Maciej Żenczykowski <maze@google.com> | 2023-10-18 17:23:01 +0000 |
| commit | e99c72d752638b55c64a38706446b1d2744b3342 (patch) | |
| tree | 6a0462f21ec5580d3a169986679a5e3d25a352af | |
| parent | 9ea287214d390b9eff82ab2133ea9feb9ea16106 (diff) | |
| parent | 0d290e451f94c80c0b11ed43c6f478dccea30047 (diff) | |
| download | iptables-e99c72d752638b55c64a38706446b1d2744b3342.tar.gz | |
Merge remote-tracking branch 'aosp/main' into HEAD
* aosp/main:
Move OWNER reference master=>main.
[NFC] Move MTE mode settings to a product variable.
Ignore-AOSP-First: this is a merge from AOSP
Bug: 305814576
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ibc7cf9439e29f98d83f6e9207de8e34e02044578
0 files changed, 0 insertions, 0 deletions