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