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

Change-Id: Ibd788cacb6c4c1ebd71f31af5c9b48a3a0c143f1


Trivial merge