OSDN Git Service

Merge "Replace pthread_mutex with std::mutex" am: eccb74f122 am: 416c62744b
authorMarie Janssen <jamuraa@google.com>
Fri, 4 Nov 2016 20:46:40 +0000 (20:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 4 Nov 2016 20:46:40 +0000 (20:46 +0000)
commit38bdfb866aca7d02ed02b4af071386ecf7222b1d
treeec4d06649b57bff822035c88f2859ec6df27e02d
parent606497988c34eff0db4c335cbc4823074dd842fe
parentdfadac8a5fdae40e8bfc1a0ea398135175f28aa8
Merge "Replace pthread_mutex with std::mutex" am: eccb74f122 am: 416c62744b
am: dfadac8a5f

Change-Id: If9b6f21824275d42b2f3e7babb868afde1e0c72f