Merge "x11: Call XInitThreads() am: 5d11c9d2c0 am: f465d82fa5 am: 0ed6cc912e am:...
authorChad Versace <chadversary@google.com>
Tue, 22 Aug 2017 20:43:13 +0000 (20:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:43:13 +0000 (20:43 +0000)
am: 4571e7c02d

Change-Id: I26ce1e5b648c349e03b2bc0882533e629985d855


Trivial merge