Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea
authorTina Zhou <tinazh@google.com>
Mon, 23 Jan 2017 19:22:13 +0000 (19:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 19:22:13 +0000 (19:22 +0000)
am: f1dcdc55d5

Change-Id: Ic823ceca5963c2fcb5ab4be0324cb57cfb102561


Trivial merge