Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222
authorTina Zhou <tinazh@google.com>
Mon, 23 Jan 2017 19:25:05 +0000 (19:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 19:25:05 +0000 (19:25 +0000)
commitf23a03362a95fd372c730cc8e2cde4210bf18a97
treec0b40d7379fd602b926780d0d3585902a028607a
parent8c04df2e48d96ce2166bc0d4b632b1647424519e
parent6aef236dd0407d8eab330c1eade4375455c00f53
Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222
am: 6aef236dd0

Change-Id: Ide0e9861cc1e38bf32030cdc89f2128d3d72b7d5