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

Change-Id: Ieec0626951d0d7344b4057a8d86ffdf91d90fc06


Trivial merge