Merge "x11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223 am: 319a51d5dd...
authorChad Versace <chadversary@google.com>
Mon, 23 Jan 2017 20:02:09 +0000 (20:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 20:02:09 +0000 (20:02 +0000)
commit046abc286f975de6753a8859b7ae4a1be5e03adb
treec1eef06a1799372b07d1e79815cd1a53838f5b51
parent2bdcc4700acd0c87ae2fe207fc4102323ab7f6df
parente5b8804c39c5cedc4229f740cda2fc133dfc8549
Merge "x11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223 am: 319a51d5dd am: 97cc16aa0a am: 8b86967b6f" into nyc-mr2-dev-plus-aosp
am: e5b8804c39

Change-Id: I5db3ec87559ca4d31bccf001c7bfc8cf74bf2710