resolve merge conflicts of c94e810cab to rvc-dev-plus-aosp

Browse Source

Change-Id: I47128585a8259dc51f25d679d1841578138f9a1d

...

This commit is contained in:

Andrei Onea

2020-08-05 17:41:18 +01:00

parent 655eb212ec c94e810cab

commit 6be88efde5

6 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

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

0

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

0

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

0

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

0

config/hiddenapi-greylist-packages.txt → config/hiddenapi-unsupported-packages.txt

0

config/hiddenapi-greylist.txt → config/hiddenapi-unsupported.txt