Merge "One time permission grant to default noti assistant"

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

Wed, 17 Jan 2018 17:15:42 +0000 (17:15 +0000)

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

Wed, 17 Jan 2018 17:15:42 +0000 (17:15 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Wed, 17 Jan 2018 17:15:42 +0000 (17:15 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 17 Jan 2018 17:15:42 +0000 (17:15 +0000)
diff --cc core/res/res/values/config.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
diff --cc services/core/java/com/android/server/notification/NotificationManagerService.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Wed, 17 Jan 2018 17:15:42 +0000 (17:15 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 17 Jan 2018 17:15:42 +0000 (17:15 +0000)
		1	2
core/res/res/values/config.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/symbols.xml	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/notification/NotificationManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history