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

Change-Id: I0a70107b4820a2c837539701ac7e7c47a61de6e5


Trivial merge