tree 1369df2ae90b47e7982c9eed3ad9ec387682267e
parent b7245e4b09b49e857245b32313117d6000f4061c
parent 3a6a2f1bbd79bd31537d9afb09682761480d2b8f
author Martin Brabham <optedoblivion@google.com> 1557334691 -0700
committer android-build-merger <android-build-merger@google.com> 1557334691 -0700

[automerger skipped] Merge "DO NOT MERGE: osi: Offload mutex pointer to local scope" into oc-dev am: 61aa0961d7 am: 7478e20128
am: 3a6a2f1bbd -s ours
am skip reason: subject contains skip directive

Change-Id: Id031a291948c84874a9d70b87cfe4ed57f1ed389