Merge "x11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223 am: 319a51d5dd...
authorChad Versace <chadversary@google.com>
Tue, 22 Aug 2017 20:39:52 +0000 (20:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:39:52 +0000 (20:39 +0000)
am: 046abc286f

Change-Id: I8f8fd362feb657149c3705d9fe39d5039d08d1a5


Trivial merge