Merge "Allow manual to be read from disk" into mnc-dr-dev

author Zach Kuznia <zork@google.com>

Thu, 1 Oct 2015 00:08:05 +0000 (00:08 +0000)

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

Thu, 1 Oct 2015 00:08:05 +0000 (00:08 +0000)
author Zach Kuznia <zork@google.com>
Thu, 1 Oct 2015 00:08:05 +0000 (00:08 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 1 Oct 2015 00:08:05 +0000 (00:08 +0000)
diff --cc AndroidManifest.xml
Simple merge
diff --cc res/values/bools.xml
Simple merge
diff --cc res/values/strings.xml
Simple merge
diff --cc src/com/android/settings/DeviceInfoSettings.java
Simple merge
author	Zach Kuznia <zork@google.com>
	Thu, 1 Oct 2015 00:08:05 +0000 (00:08 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 1 Oct 2015 00:08:05 +0000 (00:08 +0000)
		1	2
AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
res/values/bools.xml	patch \|	diff1 \|	diff2 \|	blob \| history
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/DeviceInfoSettings.java	patch \|	diff1 \|	diff2 \|	blob \| history