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

Change-Id: I824cb1c6099369471b3d727f2d2e40c9eacd389b


Trivial merge