Merge "media: unhide MediaRecorder.pause()/resume()"

author Wonsik Kim <wonsik@google.com>

Wed, 27 Jan 2016 18:01:28 +0000 (18:01 +0000)

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

Wed, 27 Jan 2016 18:01:28 +0000 (18:01 +0000)
author Wonsik Kim <wonsik@google.com>
Wed, 27 Jan 2016 18:01:28 +0000 (18:01 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 27 Jan 2016 18:01:28 +0000 (18:01 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
diff --cc media/java/android/media/MediaRecorder.java
Simple merge
author	Wonsik Kim <wonsik@google.com>
	Wed, 27 Jan 2016 18:01:28 +0000 (18:01 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 27 Jan 2016 18:01:28 +0000 (18:01 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
media/java/android/media/MediaRecorder.java	patch \|	diff1 \|	diff2 \|	blob \| history