Merge "Make sure notifications from the default sms app do not get filtered to the...

author Nadia Benbernou <nbenbernou@google.com>

Mon, 4 Feb 2019 17:25:31 +0000 (17:25 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Mon, 4 Feb 2019 17:25:31 +0000 (17:25 +0000)
author Nadia Benbernou <nbenbernou@google.com>
Mon, 4 Feb 2019 17:25:31 +0000 (17:25 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 4 Feb 2019 17:25:31 +0000 (17:25 +0000)
diff --cc core/res/AndroidManifest.xml
Simple merge
diff --cc data/etc/privapp-permissions-platform.xml
Simple merge
author	Nadia Benbernou <nbenbernou@google.com>
	Mon, 4 Feb 2019 17:25:31 +0000 (17:25 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 4 Feb 2019 17:25:31 +0000 (17:25 +0000)
		1	2
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
data/etc/privapp-permissions-platform.xml	patch \|	diff1 \|	diff2 \|	blob \| history