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

Change-Id: I759a33eb0d9223763327636e589b3bcae65c70e9


Trivial merge