Merge "Revert "Add a service to rank apps for ResolverActivity."" into oc-dev

author Kang Li <kanlig@google.com>

Wed, 5 Apr 2017 19:50:06 +0000 (19:50 +0000)

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

Wed, 5 Apr 2017 19:50:10 +0000 (19:50 +0000)
author Kang Li <kanlig@google.com>
Wed, 5 Apr 2017 19:50:06 +0000 (19:50 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 5 Apr 2017 19:50:10 +0000 (19:50 +0000)
diff --cc Android.mk
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc core/res/AndroidManifest.xml
Simple merge
author	Kang Li <kanlig@google.com>
	Wed, 5 Apr 2017 19:50:06 +0000 (19:50 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 5 Apr 2017 19:50:10 +0000 (19:50 +0000)
		1	2
Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history