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