Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949 am: 7b1b2...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 20:36:22 +0000 (20:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:36:22 +0000 (20:36 +0000)
commit1ddc800b11752901c8d817bf0ae881ed727940ce
treef83c4ae88105474ccba79791513065abe1ff2c93
parentffbd7bfba1c0f83bd0266e62555e3e4f1a412bce
parenteb4d5280cf75e54490c78dfc60fe1d6d9d148260
Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949 am: 7b1b2f4509 am: ce18fbd526 am: 243a52b3c7 am: b2b1341dbf
am: eb4d5280cf

Change-Id: I78e1e5c0c71e787f0a37278e2e03bf8425cad17b