Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0 am: 7bb50...
authorTina Zhou <tinazh@google.com>
Mon, 23 Jan 2017 19:45:01 +0000 (19:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 19:45:01 +0000 (19:45 +0000)
commitb969431bfdd8dd7a170f490d0f5a4723932c39b0
treecd584ad40c957bab6a7da80d0ca5f81520a27e4d
parent8b86967b6ff101f977d92b3e2d493601ef9b3d7a
parentd737e16da82fe08fde1698537e8bde9fc077919d
Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0 am: 7bb5047d5e am: 1b341143c0
am: d737e16da8

Change-Id: I1f2ecb78180c0f911844355d7ca838642d22b770