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

Change-Id: I79cb795f0224730897b2c7686d7c780c8549fc13


Trivial merge