| commit | 820885090d39243462355460df6c010369cefc4a | [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 | 4f3022fa0917132b7b60bd1b4be2289345b36ec4 [diff] | |
| parent | a6bc0e137329be66683ede5bfe9bbc411f0c221a [diff] |
Merge changes from topics "move-kerneltotag", "move-socket-tagging-to-mainline" am: a6bc0e1373 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1964912 Change-Id: I57a58eb215f17da6ce58607600ab322766f00b69