Merge "drm: add EVENT_SESSION_RECLAIMED for resource manager."

author Ronghua Wu <ronghuawu@google.com>

Thu, 12 Mar 2015 18:05:44 +0000 (18:05 +0000)

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

Thu, 12 Mar 2015 18:05:47 +0000 (18:05 +0000)
author Ronghua Wu <ronghuawu@google.com>
Thu, 12 Mar 2015 18:05:44 +0000 (18:05 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 12 Mar 2015 18:05:47 +0000 (18:05 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc media/java/android/media/MediaDrm.java
Simple merge
author	Ronghua Wu <ronghuawu@google.com>
	Thu, 12 Mar 2015 18:05:44 +0000 (18:05 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 12 Mar 2015 18:05:47 +0000 (18:05 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
media/java/android/media/MediaDrm.java	patch \|	diff1 \|	diff2 \|	blob \| history