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)
commitb8b59d006f21f82519ae1bc7201ed538526bd763
treec1eef06a1799372b07d1e79815cd1a53838f5b51
parent8a0850e289a9aa046f7512f5d40eb034c75aa6b0
parent85a4283f7025a12e86f58c0d6f75e1768ee307bf
Merge "x11: Call XInitThreads() am: 5d11c9d2c0 am: 0fe4efcfa8 am: 8c04df2e48 am: c6bf22467b am: 9c925d6e4b" into nyc-mr2-dev-plus-aosp
am: 85a4283f70

Change-Id: I92b61e69891bb75f6462d86a04e95756621fcb07