Merge "Show dialog when launching work apps is not possible."

author Rubin Xu <rubinxu@google.com>

Mon, 25 Jan 2016 17:51:22 +0000 (17:51 +0000)

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

Mon, 25 Jan 2016 17:51:22 +0000 (17:51 +0000)
author Rubin Xu <rubinxu@google.com>
Mon, 25 Jan 2016 17:51:22 +0000 (17:51 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 25 Jan 2016 17:51:22 +0000 (17:51 +0000)
diff --cc core/res/AndroidManifest.xml
Simple merge
diff --cc core/res/res/values/strings.xml
Simple merge
author	Rubin Xu <rubinxu@google.com>
	Mon, 25 Jan 2016 17:51:22 +0000 (17:51 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 25 Jan 2016 17:51:22 +0000 (17:51 +0000)
		1	2
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history