| commit | 2eaf028bae9d23388aa0cd1b40852e3ca8614a81 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Mon Jan 31 14:36:21 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jan 31 14:36:21 2022 +0000 |
| tree | 7e45787f7bdcd9b933b20c8d62e2c38cec61e114 | |
| parent | 6e3a218678453feb6ac9928580c357ed6dd02acf [diff] | |
| parent | a00becaa861f2478b6e868885ead4078d38732f9 [diff] |
Merge changes from topics "move-kerneltotag", "move-socket-tagging-to-mainline" am: a6bc0e1373 am: 820885090d am: a00becaa86 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1964912 Change-Id: I6aeb7c5a17dc10232c6fe678330b7a9185c03f9b