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

Change-Id: Ib667fd553ab87f43a5f534c2f3e527be53c2ec32


Trivial merge