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

Change-Id: If1425de76d53473673400dd95c6c37a885dc37e3