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

Change-Id: I8f9f73e95335f76760d7c02e74e34b5f4e6ee0cd


Trivial merge