Merge "Remove EBS notification" into pi-dev

author Makoto Onuki <omakoto@google.com>

Fri, 23 Mar 2018 18:14:30 +0000 (18:14 +0000)

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

Fri, 23 Mar 2018 18:14:30 +0000 (18:14 +0000)
author Makoto Onuki <omakoto@google.com>
Fri, 23 Mar 2018 18:14:30 +0000 (18:14 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 23 Mar 2018 18:14:30 +0000 (18:14 +0000)
diff --cc core/res/res/values/strings.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
author	Makoto Onuki <omakoto@google.com>
	Fri, 23 Mar 2018 18:14:30 +0000 (18:14 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 23 Mar 2018 18:14:30 +0000 (18:14 +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