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