Merge "x11: Fix deadlock am: 5e863331b2 am: f49e8bfc0e am: 1eb4f43dc4 am: c1c16c73e6...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Mon, 23 Jan 2017 19:53:57 +0000 (19:53 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 23 Jan 2017 19:53:57 +0000 (19:53 +0000)
commit5655d18351751f47a5c8c2ff2dc5e202334cd140
treecd584ad40c957bab6a7da80d0ca5f81520a27e4d
parente721cf66ec3dc84104297c4282665d8dc2e3acc5
parent3ce8a6bb449471fdeee29f34bf3acfcaad3b862e
Merge "x11: Fix deadlock am: 5e863331b2 am: f49e8bfc0e am: 1eb4f43dc4 am: c1c16c73e6 am: a2c167bef6" into nyc-mr2-dev-plus-aosp