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

Change-Id: If1425de76d53473673400dd95c6c37a885dc37e3


Trivial merge