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

Change-Id: Idb546dd37bf11918260994f428be9445f7aa0583


Trivial merge