Merge "x11: Fix deadlock am: 5e863331b2 am: f49e8bfc0e am: 1eb4f43dc4 am: c1c16c73e6...
authorChad Versace <chadversary@google.com>
Tue, 22 Aug 2017 20:35:20 +0000 (20:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:35:20 +0000 (20:35 +0000)
am: 7bd0c1202c

Change-Id: I506f14d59c5a91b9c65b92ae2a778599ec2ecda4


Trivial merge