Merge "Settings - add support for Launch by Default"

author Fabrice Di Meglio <fdimeglio@google.com>

Fri, 3 Apr 2015 21:40:03 +0000 (21:40 +0000)

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

Fri, 3 Apr 2015 21:40:15 +0000 (21:40 +0000)
author Fabrice Di Meglio <fdimeglio@google.com>
Fri, 3 Apr 2015 21:40:03 +0000 (21:40 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 3 Apr 2015 21:40:15 +0000 (21:40 +0000)
diff --cc res/values/strings.xml
Simple merge
diff --cc src/com/android/settings/Settings.java
Simple merge
author	Fabrice Di Meglio <fdimeglio@google.com>
	Fri, 3 Apr 2015 21:40:03 +0000 (21:40 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 3 Apr 2015 21:40:15 +0000 (21:40 +0000)
		1	2
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/Settings.java	patch \|	diff1 \|	diff2 \|	blob \| history