Merge "Move bubble settings to their own page"

author Julia Reynolds <juliacr@google.com>

Fri, 29 Mar 2019 12:34:14 +0000 (12:34 +0000)

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

Fri, 29 Mar 2019 12:34:14 +0000 (12:34 +0000)
author Julia Reynolds <juliacr@google.com>
Fri, 29 Mar 2019 12:34:14 +0000 (12:34 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 29 Mar 2019 12:34:14 +0000 (12:34 +0000)
diff --cc AndroidManifest.xml
Simple merge
diff --cc res/values/strings.xml
Simple merge
author	Julia Reynolds <juliacr@google.com>
	Fri, 29 Mar 2019 12:34:14 +0000 (12:34 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 29 Mar 2019 12:34:14 +0000 (12:34 +0000)
		1	2
AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history