tree 7f62c34f30021be36712b774354f16073cf0beaa
parent 4a61e5fde9b74cabeacffac05da93847ad9bbce8
parent c962a4fc4460eb5b3e8ddb2fdd9cafd8279644a6
author Maarten Derks <maarten@fairphone.com> 1633337419 +0200
committer Maarten Derks <maarten@fairphone.com> 1633337457 +0200

Merge branch 'dev/p/fp2/lineage-rebase' into int/p/fp2

* dev/p/fp2/lineage-rebase:
  Revert "Revert "Use new-style UID routing.""
  Revert "Revert "Set both legacy and new UID routing attributes.""
  Revert "Workaround mismatch between bionic and device kernel headers"

Issue: FP2P-656
Change-Id: I4b352f7e2e93dcff92df9d2535d0c251dc7a87af