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

Merge changes from topics "move-kerneltotag", "move-socket-tagging-to-mainline" am: ec746185 

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

Change-Id: I57a58eb215f17da6ce58607600ab322766f00b69
parents b9e2b370 ec746185
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