Merge "x11: Call XInitThreads() am: 5d11c9d2c0 am: f465d82fa5 am: 0ed6cc912e am:...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Mon, 23 Jan 2017 19:55:19 +0000 (19:55 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 23 Jan 2017 19:55:19 +0000 (19:55 +0000)

Trivial merge