Merge "Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0...
authorTina Zhou <tinazh@google.com>
Mon, 23 Jan 2017 20:04:21 +0000 (20:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 20:04:21 +0000 (20:04 +0000)
commita1ad9965dab39c9de7b9ce0ebe72cd4798ff1730
treec1eef06a1799372b07d1e79815cd1a53838f5b51
parentaf1267ba5fd3d2a0698539a5d528f9cc08a5b42d
parent6cf94e941bc5dea21d6477b47d2f9f3e21c64675
Merge "Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0 am: 7bb5047d5e am: 1b341143c0 am: d737e16da8 am: 100bd75cb7" into nyc-mr2-dev-plus-aosp
am: 6cf94e941b

Change-Id: Ie2e307010f7bef574a5a2b97364f7a4f8e42a745