tree b12f4f90a1b4e68667542abf093ea4cb15b7fef6
parent 263e135474a289ef8e309b97428ab6768cd2410d
parent 5e863331b212dea40f9d5222608b9b55f3e4cc7b
author Tina Zhou <tinazh@google.com> 1485198381 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1485198381 +0000

Merge "x11: Fix deadlock" into nougat-cts-dev