Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0 am: 7bb50...
authorTina Zhou <tinazh@google.com>
Mon, 23 Jan 2017 19:54:56 +0000 (19:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 19:54:56 +0000 (19:54 +0000)
commit0520585424d3eff9cd95dee621241fd47c505368
treecd584ad40c957bab6a7da80d0ca5f81520a27e4d
parent5e2981c0c79da78658cbe0fa432b4bf0c05c6bde
parent100bd75cb7ae0cb7b21d82d8c86c70e9fba3256f
Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0 am: 7bb5047d5e am: 1b341143c0 am: d737e16da8
am: 100bd75cb7

Change-Id: Iadf1e0c66d1eb783f4ba06f05d9f4761ad7a4ff2