Merge "x11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223 am: 319a51d5dd...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Mon, 23 Jan 2017 19:54:51 +0000 (19:54 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 23 Jan 2017 19:54:51 +0000 (19:54 +0000)
commita366b6e8849e0fc172654faad610fb58683dccd7
treecd584ad40c957bab6a7da80d0ca5f81520a27e4d
parent417cdbb82959f83f6b91de98cd26c90df45f7921
parent5e2981c0c79da78658cbe0fa432b4bf0c05c6bde
Merge "x11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223 am: 319a51d5dd am: 97cc16aa0a am: ab54c5b0ef" into nyc-mr2-dev-plus-aosp