OSDN Git Service

Merge "Fix the deadlock problem"
authorChris Tate <ctate@android.com>
Fri, 2 Dec 2016 22:39:57 +0000 (22:39 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 2 Dec 2016 22:39:57 +0000 (22:39 +0000)

Trivial merge