Merge "x11: Fix deadlock am: 5e863331b2 am: f49e8bfc0e am: 1eb4f43dc4 am: c1c16c73e6...
authorChad Versace <chadversary@google.com>
Mon, 23 Jan 2017 19:59:29 +0000 (19:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 19:59:29 +0000 (19:59 +0000)
commit7bd0c1202cab791274ecc4bbe00a8e34ed047d3d
treec1eef06a1799372b07d1e79815cd1a53838f5b51
parentb58209d17b0d151166fa0fee255d3ef064b35ded
parent5655d18351751f47a5c8c2ff2dc5e202334cd140
Merge "x11: Fix deadlock am: 5e863331b2 am: f49e8bfc0e am: 1eb4f43dc4 am: c1c16c73e6 am: a2c167bef6" into nyc-mr2-dev-plus-aosp
am: 5655d18351

Change-Id: I9ee4d8c127897934566ccbfabe7ee8cab4562cea