Merge "5/n: Add face settings"

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

Thu, 2 Aug 2018 04:20:08 +0000 (04:20 +0000)

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

Thu, 2 Aug 2018 04:20:08 +0000 (04:20 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Thu, 2 Aug 2018 04:20:08 +0000 (04:20 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 2 Aug 2018 04:20:08 +0000 (04:20 +0000)
diff --cc AndroidManifest.xml
Simple merge
diff --cc res/values/strings.xml
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Thu, 2 Aug 2018 04:20:08 +0000 (04:20 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 2 Aug 2018 04:20:08 +0000 (04:20 +0000)
		1	2
AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history