Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0 am: 7bb50...
authorTina Zhou <tinazh@google.com>
Mon, 23 Jan 2017 20:04:19 +0000 (20:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 20:04:19 +0000 (20:04 +0000)
commitaf1267ba5fd3d2a0698539a5d528f9cc08a5b42d
treec1eef06a1799372b07d1e79815cd1a53838f5b51
parent4571e7c02df5646eb2e273928a2a6885fa2e764e
parent0520585424d3eff9cd95dee621241fd47c505368
Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0 am: 7bb5047d5e am: 1b341143c0 am: d737e16da8 am: 100bd75cb7
am: 0520585424

Change-Id: I4dbf6304cc45abed3baee0da9ae7b16d0d3702d5