am 4b8c96d6: Merge commit \'bc8745cc3dd94331d008d553a374e733df978963\' into HEAD
* commit '4b8c96d6cd8ead93bcc9acdf34a9e884951c7a7b': Fix an unintended difference between aosp/master and lmp-dev-plus-aosp. More cases where libc should use O_CLOEXEC. Hide ScopedTrace. Revert "Revert "Added a bionic systrace class and tracing to pthread_mutex.cpp.""
This commit is contained in:
commit
f83739d1e2