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)
commit011e9a23318ca39f1bef32e3dce4be6c9cfc0e58
tree23b804bcad9a3b8251d24b4d771aceb1b8e21d74
parentcc7bb087348c28baf53cf1281960d2dc10b1491e
parentf1dcdc55d570679fd4d71fd43c7a9b877977fdb9
Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea
am: f1dcdc55d5

Change-Id: Ic823ceca5963c2fcb5ab4be0324cb57cfb102561