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