Support dialog disclaimer text now appears properly am: adc5555acf am: bbe0e8a30b

author Matthew Fritze <mfritze@google.com>

Fri, 30 Sep 2016 17:02:27 +0000 (17:02 +0000)

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

Fri, 30 Sep 2016 17:02:27 +0000 (17:02 +0000)
author Matthew Fritze <mfritze@google.com>
Fri, 30 Sep 2016 17:02:27 +0000 (17:02 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 30 Sep 2016 17:02:27 +0000 (17:02 +0000)
diff --cc res/values/strings.xml
Simple merge
diff --cc src/com/android/settings/support/SupportDisclaimerDialogFragment.java
Simple merge
author	Matthew Fritze <mfritze@google.com>
	Fri, 30 Sep 2016 17:02:27 +0000 (17:02 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 30 Sep 2016 17:02:27 +0000 (17:02 +0000)
		1	2
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/support/SupportDisclaimerDialogFragment.java	patch \|	diff1 \|	diff2 \|	blob \| history