Skip to content
Commit 34209090 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

Merge changes from topics "move-kerneltotag",... 

Merge changes from topics "move-kerneltotag", "move-socket-tagging-to-mainline" am: ec746185 am: 101bbfd2 am: e6dd1b01 am: 5f8c7c2a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1964912

Change-Id: Ie5bdbb43340b8866dff6a68d0375ea2e065e9ba6
parents 485bf9f9 5f8c7c2a
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment