OSDN Git Service

Merge "Replace pthread_mutex with std::mutex" am: eccb74f122 am: 416c62744b am: dfada...
authorMarie Janssen <jamuraa@google.com>
Fri, 4 Nov 2016 20:50:12 +0000 (20:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 4 Nov 2016 20:50:12 +0000 (20:50 +0000)
am: 38bdfb866a

Change-Id: I65e991c65d7b982d72b44c27532ab6ab3671cae9


Trivial merge