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

Change-Id: I5620382b9fd5489a2622bcad5f864b63d92b47be


Trivial merge