| commit | 85cb7ec62830d52174576e3ea6ec7989e5c555ce | [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 | 988be722e6c5a9d5852e028d92ef326a54834c95 | |
| parent | 08eee53fe7ceca22ba4c464216b33abdaec4104e [diff] | |
| parent | 2eaf028bae9d23388aa0cd1b40852e3ca8614a81 [diff] |
Merge changes from topics "move-kerneltotag", "move-socket-tagging-to-mainline" am: a6bc0e1373 am: 820885090d am: a00becaa86 am: 2eaf028bae Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1964912 Change-Id: Ie5bdbb43340b8866dff6a68d0375ea2e065e9ba6