Merge "x11: Fix deadlock" into nougat-cts-dev
authorTina Zhou <tinazh@google.com>
Mon, 23 Jan 2017 19:12:12 +0000 (19:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 19:12:12 +0000 (19:12 +0000)
am: 34b869eeea

Change-Id: I5ffe988c3affcd3afeaf3c63b5011e42ef9a4ba1


Trivial merge