am c1e989e7: am 13ff64c2: Merge "Zero out return values in media binder calls" into...

author Robert Shih <robertshih@google.com>

Thu, 3 Sep 2015 18:05:44 +0000 (18:05 +0000)

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

Thu, 3 Sep 2015 18:05:44 +0000 (18:05 +0000)
author Robert Shih <robertshih@google.com>
Thu, 3 Sep 2015 18:05:44 +0000 (18:05 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Thu, 3 Sep 2015 18:05:44 +0000 (18:05 +0000)
diff --cc media/libmedia/IAudioPolicyService.cpp
Simple merge
diff --cc media/libmedia/IMediaPlayer.cpp
Simple merge
author	Robert Shih <robertshih@google.com>
	Thu, 3 Sep 2015 18:05:44 +0000 (18:05 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 3 Sep 2015 18:05:44 +0000 (18:05 +0000)
		1	2
media/libmedia/IAudioPolicyService.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
media/libmedia/IMediaPlayer.cpp	patch \|	diff1 \|	diff2 \|	blob \| history