Merge "x11: Call XInitThreads()" into nougat-cts-dev
authorTina Zhou <tinazh@google.com>
Mon, 23 Jan 2017 19:12:27 +0000 (19:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 19:12:27 +0000 (19:12 +0000)
commit6aef236dd0407d8eab330c1eade4375455c00f53
treeda2d9b6e0419611e238ac1ffdcaf81c1d44cd933
parent0fe4efcfa8c5373ce57bfe43c855dd7dce4ec844
parentcbdbf9522261ffbbb9bf133ca348ac3ce1c7cc1e
Merge "x11: Call XInitThreads()" into nougat-cts-dev
am: cbdbf95222

Change-Id: I2531e5a260f50c8bae1a756a61026a46ae253614