| commit | 34209090dc3a1a51755411237907cd0679d6a7fe | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Mon Jan 31 14:39:04 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jan 31 14:39:04 2022 +0000 |
| tree | ebe87c94a284589f4ed25f99e5c836addcf910b1 | |
| parent | 485bf9f9f34992f27dcd7e41c656de63d5553278 [diff] | |
| parent | 5f8c7c2abefa324bb75cb3d0ba47be695a1d211e [diff] |
Merge changes from topics "move-kerneltotag", "move-socket-tagging-to-mainline" am: ec7461850f am: 101bbfd2a2 am: e6dd1b01db am: 5f8c7c2abe Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1964912 Change-Id: Ie5bdbb43340b8866dff6a68d0375ea2e065e9ba6