Merge "x11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223 am: 319a51d5dd...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Mon, 23 Jan 2017 19:54:31 +0000 (19:54 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 23 Jan 2017 19:54:31 +0000 (19:54 +0000)
commite5b8804c39c5cedc4229f740cda2fc133dfc8549
treecd584ad40c957bab6a7da80d0ca5f81520a27e4d
parent85a4283f7025a12e86f58c0d6f75e1768ee307bf
parentd7d2897995072a6c3ce522505e5e98399e8c8c41
Merge "x11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223 am: 319a51d5dd am: 97cc16aa0a am: 8b86967b6f" into nyc-mr2-dev-plus-aosp