Merge "MediaRecorder.h:correct MEDIA_RECORDER_ERROR enum"