Merge "Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 20:36:57 +0000 (20:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:36:57 +0000 (20:36 +0000)
am: 6642262b18

Change-Id: Ie411be7ba420eecaaba6e029d8c28739cc09a26d


Trivial merge