| commit | 101bbfd2a23cb984fe249747c58cb9cf6bfb06d3 | [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 | 3915f8c0264bba2e89ecfadb2659bd19c01bf17b | |
| parent | b9e2b370fba16bdcf6fd12e234bfd94f4ae34e24 [diff] | |
| parent | ec7461850fc05cb56efed86d44ddd9dbf7241f24 [diff] |
Merge changes from topics "move-kerneltotag", "move-socket-tagging-to-mainline" am: ec7461850f Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1964912 Change-Id: I57a58eb215f17da6ce58607600ab322766f00b69