Merge "Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Mon, 23 Jan 2017 19:54:44 +0000 (19:54 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 23 Jan 2017 19:54:44 +0000 (19:54 +0000)

Trivial merge