Merge "Delete old WifiNotificationController strings." am: 6daef4499f am: f412290e94

author Stephen Chen <stewchen@google.com>

Wed, 11 Jan 2017 02:28:54 +0000 (02:28 +0000)

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

Wed, 11 Jan 2017 02:28:54 +0000 (02:28 +0000)
author Stephen Chen <stewchen@google.com>
Wed, 11 Jan 2017 02:28:54 +0000 (02:28 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 11 Jan 2017 02:28:54 +0000 (02:28 +0000)
diff --cc core/res/res/values/strings.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
author	Stephen Chen <stewchen@google.com>
	Wed, 11 Jan 2017 02:28:54 +0000 (02:28 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 11 Jan 2017 02:28:54 +0000 (02:28 +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