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

author Selim Cinek <cinek@google.com>

Sun, 23 Jul 2017 13:11:23 +0000 (13:11 +0000)

committer android-build-merger <android-build-merger@google.com>

Sun, 23 Jul 2017 13:11:23 +0000 (13:11 +0000)
author Selim Cinek <cinek@google.com>
Sun, 23 Jul 2017 13:11:23 +0000 (13:11 +0000)
committer android-build-merger <android-build-merger@google.com>
Sun, 23 Jul 2017 13:11:23 +0000 (13:11 +0000)
diff --cc core/res/res/values/strings.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
author	Selim Cinek <cinek@google.com>
	Sun, 23 Jul 2017 13:11:23 +0000 (13:11 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Sun, 23 Jul 2017 13:11:23 +0000 (13:11 +0000)
		1	2
core/res/res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/symbols.xml	patch \|	diff1 \|	diff2 \|	blob \| history