Merge "Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: 6aef23...
authorTina Zhou <tinazh@google.com>
Mon, 23 Jan 2017 20:00:59 +0000 (20:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 20:00:59 +0000 (20:00 +0000)
am: 33b8a60c2e

Change-Id: I56fd8e498a53b931fbf9bfa134fd22d34fe801ae


Trivial merge