tree fffa8c7461659ba0ecb7329ee00f344c712f9e89
parent 2f7e44b1e66878425ee569f8b67cd8d1a00eb146
parent fc7a7bb6e98ee29e53271428304ebb57b70c88f9
author Lajos Molnar <lajos@google.com> 1508521304 +0000
committer android-build-merger <android-build-merger@google.com> 1508521304 +0000

Merge "OMXNodeInstance: use a lock in freeNode" into lmp-mr1-dev am: 60719598d5 am: cdf0a102d9 am: 57ac76182e am: 36950f753b am: a4cc48a3ae am: f3b4e5d222 am: 73a7e98790 am: 0b306b0517 am: bef1ae9f4d am: 6c930ece3c  -s ours am: 40f6d8a086 am: 29f32408c6
am: fc7a7bb6e9

Change-Id: I0958f4c84fa2acd3a23afe9322bb783508cc71b0