Merge "x11: Fix deadlock" into nougat-cts-dev
authorTina Zhou <tinazh@google.com>
Mon, 23 Jan 2017 19:06:21 +0000 (19:06 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 23 Jan 2017 19:06:21 +0000 (19:06 +0000)
commit34b869eeea624f72c8c18d5055b9898af740106f
treeb12f4f90a1b4e68667542abf093ea4cb15b7fef6
parent263e135474a289ef8e309b97428ab6768cd2410d
parent5e863331b212dea40f9d5222608b9b55f3e4cc7b
Merge "x11: Fix deadlock" into nougat-cts-dev