tree 1b4880966ffb27ef688918aa8968c91c25d788e2
parent 20ddd7f5c15b2897529fea3b4edf0e043fe1d3b0
parent 102b970dfb9eb59ba210e279723cd5f471c5a622
author Lajos Molnar <lajos@google.com> 1508521411 +0000
committer android-build-merger <android-build-merger@google.com> 1508521411 +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 am: f5eb536d90 am: 27bdac8e05 am: fab889e9e6 am: 44a79a8db8 am: bdbb380663
am: 102b970dfb

Change-Id: I9f2b1122612f4e4526defee1a9b2878bc641482e