Merge "x11: Call XInitThreads() am: 5d11c9d2c0 am: 0fe4efcfa8 am: 8c04df2e48 am:...
authorChad Versace <chadversary@google.com>
Mon, 23 Jan 2017 20:01:36 +0000 (20:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 20:01:36 +0000 (20:01 +0000)
am: 85a4283f70

Change-Id: I92b61e69891bb75f6462d86a04e95756621fcb07


Trivial merge