Merge "Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949...
authorTina Zhou <tinazh@google.com>
Mon, 23 Jan 2017 20:00:21 +0000 (20:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 20:00:21 +0000 (20:00 +0000)
commit6642262b1816acbd2440e6fd10a063235ecb2d51
treec1eef06a1799372b07d1e79815cd1a53838f5b51
parenteb4d5280cf75e54490c78dfc60fe1d6d9d148260
parent513d6ae450a12e81f6d6d25e6b325c77e6e3cc07
Merge "Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949 am: 7b1b2f4509 am: ce18fbd526 am: 243a52b3c7" into nyc-mr2-dev-plus-aosp
am: 513d6ae450

Change-Id: I6d4d2fd9ee3f435b8ec891e3715978033e665fd3