am 6474d840: am 636af7a1: Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into...

author Jeff Brown <jeffbrown@google.com>

Fri, 31 May 2013 01:02:31 +0000 (18:02 -0700)

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

Fri, 31 May 2013 01:02:31 +0000 (18:02 -0700)
author Jeff Brown <jeffbrown@google.com>
Fri, 31 May 2013 01:02:31 +0000 (18:02 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 31 May 2013 01:02:31 +0000 (18:02 -0700)
diff --cc api/current.txt
Simple merge
diff --cc media/java/android/media/MediaRouter.java
Simple merge
author	Jeff Brown <jeffbrown@google.com>
	Fri, 31 May 2013 01:02:31 +0000 (18:02 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 31 May 2013 01:02:31 +0000 (18:02 -0700)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
media/java/android/media/MediaRouter.java	patch \|	diff1 \|	diff2 \|	blob \| history