Merge "x11: Call XInitThreads() am: 5d11c9d2c0 am: f465d82fa5 am: 0ed6cc912e am:...
authorChad Versace <chadversary@google.com>
Mon, 23 Jan 2017 20:05:13 +0000 (20:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 20:05:13 +0000 (20:05 +0000)
am: ca30439bc2

Change-Id: I14488e161d64bccdfce212f9316a9512bf15ac7e


Trivial merge