Merge "x11: Call XInitThreads() am: 5d11c9d2c0 am: 0fe4efcfa8 am: 8c04df2e48 am:...
authorChad Versace <chadversary@google.com>
Tue, 22 Aug 2017 20:39:08 +0000 (20:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:39:08 +0000 (20:39 +0000)
am: b8b59d006f

Change-Id: I7df3da1da3479c93bd3bdbc4619e8487123b2140


Trivial merge