Merge "Removing contents hidden string for public notifications" into oc-dr1-dev

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

Sun, 23 Jul 2017 12:51:43 +0000 (12:51 +0000)

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

Sun, 23 Jul 2017 12:51:43 +0000 (12:51 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Sun, 23 Jul 2017 12:51:43 +0000 (12:51 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Sun, 23 Jul 2017 12:51:43 +0000 (12:51 +0000)
diff --cc core/java/android/app/Notification.java
Simple merge
diff --cc core/res/res/values/strings.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Sun, 23 Jul 2017 12:51:43 +0000 (12:51 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sun, 23 Jul 2017 12:51:43 +0000 (12:51 +0000)
		1	2
core/java/android/app/Notification.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/symbols.xml	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java	patch \|	diff1 \|	diff2 \|	blob \| history