[automerger skipped] OMXNodeInstance: Guard mActiveBuffers by mLock am:...
[automerger skipped] OMXNodeInstance: Guard mActiveBuffers by mLock am: 301dd5f1 am: bdf240b6 am: 88f461eb am: bdec0b18 -s ours
am skip reason: Change-Id I02b5c0be94a674fe21884d9faa0c0c9cfbedd5fc with SHA-1 0329492f is in history
Change-Id: I1a75244629199b06332d54b5eb0f304e905e118a