| commit | c1d80ec4ac09c79d6080b1ee917e8f8943b190de | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Mon Jan 31 14:04:58 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jan 31 14:04:58 2022 +0000 |
| tree | 7e45787f7bdcd9b933b20c8d62e2c38cec61e114 | |
| parent | 0e7a5f6b5a6062710d9e1968a25c4a147d000e53 [diff] | |
| parent | 623d59f6adf0da43a1f1bd5faf4d926c30131a1b [diff] |
Merge changes from topics "move-kerneltotag", "move-socket-tagging-to-mainline" am: 623d59f6ad Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1964912 Change-Id: I57a58eb215f17da6ce58607600ab322766f00b69