Commit a655b52d authored Apr 02, 2021 by Steven Moreland Committed by Automerger Merge Worker Apr 02, 2021

Noop mediaresourcemanager change to avoid conflict am: eb009aaf am: c92a697f

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1662927

Change-Id: Ie18ff66243b92f95ff877f52e0f86121e42ed5ce

services/mediaresourcemanager/ResourceManagerService.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@
		#include <android/binder_manager.h>
		#include <android/binder_process.h>
		#include <binder/IMediaResourceMonitor.h>
		#include <binder/IPCThreadState.h>
		#include <binder/IServiceManager.h>
		#include <cutils/sched_policy.h>
		#include <dirent.h>