Merge "x11: Fix deadlock" into nougat-cts-dev
authorTina Zhou <tinazh@google.com>
Mon, 23 Jan 2017 19:06:21 +0000 (19:06 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 23 Jan 2017 19:06:21 +0000 (19:06 +0000)

Trivial merge