Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949 am: 7b1b2...
authorTina Zhou <tinazh@google.com>
Mon, 23 Jan 2017 19:54:02 +0000 (19:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 19:54:02 +0000 (19:54 +0000)
commitb2b1341dbf8ef11cb54f93d326a755c83016135f
treecd584ad40c957bab6a7da80d0ca5f81520a27e4d
parent3ce8a6bb449471fdeee29f34bf3acfcaad3b862e
parent243a52b3c7a8efc8a6a3e19430c1ca038d99df57
Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949 am: 7b1b2f4509 am: ce18fbd526
am: 243a52b3c7

Change-Id: Ic16c4f83b7c340b0685d11a1cebb2b6abcf938dd