Merge "Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949...
authorTina Zhou <tinazh@google.com>
Mon, 23 Jan 2017 20:00:21 +0000 (20:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 20:00:21 +0000 (20:00 +0000)
am: 513d6ae450

Change-Id: I6d4d2fd9ee3f435b8ec891e3715978033e665fd3


Trivial merge