Merge "Allow the old launcher content URI to be overrided" into ub-now-mister-ugly

author Adam Cohen <adamcohen@google.com>

Thu, 17 Apr 2014 00:53:52 +0000 (00:53 +0000)

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

Thu, 17 Apr 2014 00:53:52 +0000 (00:53 +0000)
author Adam Cohen <adamcohen@google.com>
Thu, 17 Apr 2014 00:53:52 +0000 (00:53 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 17 Apr 2014 00:53:52 +0000 (00:53 +0000)
diff --cc res/values/strings.xml
Simple merge
diff --cc src/com/android/launcher3/LauncherModel.java
Simple merge
diff --cc src/com/android/launcher3/LauncherProvider.java
Simple merge
author	Adam Cohen <adamcohen@google.com>
	Thu, 17 Apr 2014 00:53:52 +0000 (00:53 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 17 Apr 2014 00:53:52 +0000 (00:53 +0000)
		1	2
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/launcher3/LauncherModel.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/launcher3/LauncherProvider.java	patch \|	diff1 \|	diff2 \|	blob \| history