Merge "Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 20:44:21 +0000 (20:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:44:21 +0000 (20:44 +0000)
am: a1ad9965da

Change-Id: I948a07f2e4401225266751d70eb2a1d21f6f81c9


Trivial merge