Merge "Implement UI for warn-on-launch"

author Ben Gruver <bgruv@google.com>

Fri, 26 Jan 2018 18:44:11 +0000 (18:44 +0000)

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

Fri, 26 Jan 2018 18:44:11 +0000 (18:44 +0000)
author Ben Gruver <bgruv@google.com>
Fri, 26 Jan 2018 18:44:11 +0000 (18:44 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 26 Jan 2018 18:44:11 +0000 (18:44 +0000)
diff --cc Android.bp
Simple merge
diff --cc core/res/AndroidManifest.xml
Simple merge
diff --cc core/res/res/values/strings.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
author	Ben Gruver <bgruv@google.com>
	Fri, 26 Jan 2018 18:44:11 +0000 (18:44 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 26 Jan 2018 18:44:11 +0000 (18:44 +0000)
		1	2
Android.bp	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/symbols.xml	patch \|	diff1 \|	diff2 \|	blob \| history