am 6a5f4d85: Merge "Adding more specific title for pick-application dialog." into...

author Winson Chung <winsonc@google.com>

Thu, 7 Oct 2010 00:09:10 +0000 (17:09 -0700)

committer Android Git Automerger <android-git-automerger@android.com>

Thu, 7 Oct 2010 00:09:10 +0000 (17:09 -0700)
author Winson Chung <winsonc@google.com>
Thu, 7 Oct 2010 00:09:10 +0000 (17:09 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Thu, 7 Oct 2010 00:09:10 +0000 (17:09 -0700)
diff --cc res/values/strings.xml
Simple merge
diff --cc src/com/android/launcher2/Launcher.java
Simple merge
author	Winson Chung <winsonc@google.com>
	Thu, 7 Oct 2010 00:09:10 +0000 (17:09 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 7 Oct 2010 00:09:10 +0000 (17:09 -0700)
		1	2
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/launcher2/Launcher.java	patch \|	diff1 \|	diff2 \|	blob \| history