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

Change-Id: I2ee13c332f808a952055d23e58daecbf42f6cdc6


Trivial merge