am bd4da52c: (-s ours) am 51d12c26: Merge "mediaresourcemanager: handle the...
am bd4da52c: (-s ours) am 51d12c26: Merge "mediaresourcemanager: handle the case when there\'s no client holding resource with the same type" into mnc-dev
* commit 'bd4da52c':