Merge "Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Mon, 23 Jan 2017 19:55:03 +0000 (19:55 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 23 Jan 2017 19:55:04 +0000 (19:55 +0000)
commit6cf94e941bc5dea21d6477b47d2f9f3e21c64675
treecd584ad40c957bab6a7da80d0ca5f81520a27e4d
parentc3ee6c9e59de6748f36eb7121eb7afb9fe99fc04
parent0520585424d3eff9cd95dee621241fd47c505368
Merge "Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0 am: 7bb5047d5e am: 1b341143c0 am: d737e16da8 am: 100bd75cb7" into nyc-mr2-dev-plus-aosp