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

Change-Id: I089e912a67bdac73c08569b34356a7ad205b68d7


Trivial merge