Merge "Pipe caller's identity through volume methods" into lmp-dev

author RoboErik <epastern@google.com>

Thu, 14 Aug 2014 18:05:19 +0000 (18:05 +0000)

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

Wed, 13 Aug 2014 01:30:58 +0000 (01:30 +0000)
author RoboErik <epastern@google.com>
Thu, 14 Aug 2014 18:05:19 +0000 (18:05 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 13 Aug 2014 01:30:58 +0000 (01:30 +0000)
diff --cc media/java/android/media/AudioService.java
Simple merge
diff --cc media/java/android/media/session/MediaController.java
Simple merge
diff --cc services/core/java/com/android/server/media/MediaSessionRecord.java
Simple merge
author	RoboErik <epastern@google.com>
	Thu, 14 Aug 2014 18:05:19 +0000 (18:05 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 13 Aug 2014 01:30:58 +0000 (01:30 +0000)
		1	2
media/java/android/media/AudioService.java	patch \|	diff1 \|	diff2 \|	blob \| history
media/java/android/media/session/MediaController.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/media/MediaSessionRecord.java	patch \|	diff1 \|	diff2 \|	blob \| history