Merge "Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Mon, 23 Jan 2017 19:54:09 +0000 (19:54 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 23 Jan 2017 19:54:10 +0000 (19:54 +0000)
commit513d6ae450a12e81f6d6d25e6b325c77e6e3cc07
treecd584ad40c957bab6a7da80d0ca5f81520a27e4d
parent8e18c56bea8bf32472e4489db519d964bb8169ec
parentb2b1341dbf8ef11cb54f93d326a755c83016135f
Merge "Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949 am: 7b1b2f4509 am: ce18fbd526 am: 243a52b3c7" into nyc-mr2-dev-plus-aosp