am 5f0c0498: Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev

author Jose Lima <joselima@google.com>

Tue, 11 Mar 2014 19:19:11 +0000 (19:19 +0000)

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

Tue, 11 Mar 2014 19:19:11 +0000 (19:19 +0000)
author Jose Lima <joselima@google.com>
Tue, 11 Mar 2014 19:19:11 +0000 (19:19 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Tue, 11 Mar 2014 19:19:11 +0000 (19:19 +0000)
diff --cc api/current.txt
Simple merge
diff --cc core/java/android/content/Intent.java
Simple merge
author	Jose Lima <joselima@google.com>
	Tue, 11 Mar 2014 19:19:11 +0000 (19:19 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Tue, 11 Mar 2014 19:19:11 +0000 (19:19 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/content/Intent.java	patch \|	diff1 \|	diff2 \|	blob \| history