x11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223 am: 319a51d5dd
authorChad Versace <chadversary@google.com>
Mon, 23 Jan 2017 19:46:59 +0000 (19:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 19:46:59 +0000 (19:46 +0000)
am: 97cc16aa0a

Change-Id: Id2519746b786bdb934ae7dc9da3d9aab11ae1620


Trivial merge