Merge "whitelist pri permission for carrierconfig app"

author Treehugger Robot <treehugger-gerrit@google.com>

Fri, 21 Dec 2018 03:56:21 +0000 (03:56 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Fri, 21 Dec 2018 03:56:21 +0000 (03:56 +0000)
author Treehugger Robot <treehugger-gerrit@google.com>
Fri, 21 Dec 2018 03:56:21 +0000 (03:56 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 21 Dec 2018 03:56:21 +0000 (03:56 +0000)
diff --cc data/etc/privapp-permissions-platform.xml
Simple merge
author	Treehugger Robot <treehugger-gerrit@google.com>
	Fri, 21 Dec 2018 03:56:21 +0000 (03:56 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Fri, 21 Dec 2018 03:56:21 +0000 (03:56 +0000)