tree 5ea275d4b6a849eae26e0fdaaf23277c2d9bc694
parent 68d7af91375bf5b8f945e8235e7d1db759ecfd34
parent 2d073bdd1e3bc1cb0e1442491a7d463752128932
author Lajos Molnar <lajos@google.com> 1508454278 +0000
committer android-build-merger <android-build-merger@google.com> 1508454278 +0000

Merge "OMXNodeInstance: use a lock in freeNode" into lmp-dev am: 288566faba  -s ours am: 2a5e425ab4 am: 96c2fafc29 am: b9da9fc1aa am: ee22f8a68e am: efd26f8a61
am: 2d073bdd1e

Change-Id: I6e1fc676ee614b13229f1846f601fe26eb69ff62