Merge "x11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223 am: 319a51d5dd...
authorChad Versace <chadversary@google.com>
Mon, 23 Jan 2017 20:03:35 +0000 (20:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 20:03:35 +0000 (20:03 +0000)
commitc2525d73af4d06a6ff89e45ccb8716243bb56604
treec1eef06a1799372b07d1e79815cd1a53838f5b51
parentf1b483026f9e1bb2f0d856c8d1679d25348a5c54
parenta366b6e8849e0fc172654faad610fb58683dccd7
Merge "x11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223 am: 319a51d5dd am: 97cc16aa0a am: ab54c5b0ef" into nyc-mr2-dev-plus-aosp
am: a366b6e884

Change-Id: I062cdcc67d83d37c5ccf2d4eb8a36a93f82e807c