[automerger skipped] OMXNodeInstance: Guard mActiveBuffers by mLock am:...
[automerger skipped] OMXNodeInstance: Guard mActiveBuffers by mLock am: 301dd5f1 am: ceff89a1 -s ours am: c893fe99 -s ours
am skip reason: Change-Id I02b5c0be94a674fe21884d9faa0c0c9cfbedd5fc with SHA-1 301dd5f1 is in history
Change-Id: I95fa4c52f5e6684fc480da750b223511f1353bb1