Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949 am: 7b1b2...
authorTina Zhou <tinazh@google.com>
Mon, 23 Jan 2017 19:44:04 +0000 (19:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 19:44:04 +0000 (19:44 +0000)
commitaee042a8874db06d9606f3bf09b150e731bddcb4
treecd584ad40c957bab6a7da80d0ca5f81520a27e4d
parent5a37f3c8ca35c39bf1cddc3bfbd034fea15ba4c1
parentce18fbd526a4489a2e059de103225a80559e219f
Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949 am: 7b1b2f4509
am: ce18fbd526

Change-Id: I09e8f4fb4dfc224e48334540dc507fee18ee9368