Merge "Add media router service and integrate with remote displays." into klp-dev

author Jeff Brown <jeffbrown@google.com>

Fri, 8 Nov 2013 01:36:55 +0000 (01:36 +0000)

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

Fri, 8 Nov 2013 01:36:55 +0000 (01:36 +0000)
author Jeff Brown <jeffbrown@google.com>
Fri, 8 Nov 2013 01:36:55 +0000 (01:36 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 8 Nov 2013 01:36:55 +0000 (01:36 +0000)
diff --cc Android.mk
Simple merge
diff --cc services/java/com/android/server/SystemServer.java
Simple merge
author	Jeff Brown <jeffbrown@google.com>
	Fri, 8 Nov 2013 01:36:55 +0000 (01:36 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 8 Nov 2013 01:36:55 +0000 (01:36 +0000)
		1	2
Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
services/java/com/android/server/SystemServer.java	patch \|	diff1 \|	diff2 \|	blob \| history