Merge "Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: a74d50...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 20:45:17 +0000 (20:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:45:17 +0000 (20:45 +0000)
am: 6b748a77a5

Change-Id: If41c2d0446c27ce0d70c103587f4169eb9a153ed


Trivial merge