Merge "Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: 6aef23...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 20:38:07 +0000 (20:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:38:07 +0000 (20:38 +0000)
am: 85ec913b61

Change-Id: I2a2b245bfbfa5e7c88fce3581c6a35bf8239b00d


Trivial merge