Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26c79b96 authored Apr 07, 2021 by Paul Duffin

resolve merge conflicts of 86472844 to sc-dev

Bug: 179354495
Test: m nothing
Change-Id: I44f047eb68624d66dd215b4a8395d52dec22e4f2

parents 01d16d84 86472844

config/hiddenapi-force-blocked.txt→boot/hiddenapi/hiddenapi-force-blocked.txt

+0 −0

File moved.

config/hiddenapi-max-target-o.txt→boot/hiddenapi/hiddenapi-max-target-o.txt

+0 −0

File moved.

config/hiddenapi-max-target-p.txt→boot/hiddenapi/hiddenapi-max-target-p.txt

+0 −0

File moved.

config/hiddenapi-max-target-q.txt→boot/hiddenapi/hiddenapi-max-target-q.txt

+0 −0

File moved.

config/hiddenapi-max-target-r-loprio.txt→boot/hiddenapi/hiddenapi-max-target-r-loprio.txt

+0 −0

File moved.