x11: Fix deadlock am: 5e863331b2 am: f49e8bfc0e am: 1eb4f43dc4 am: c1c16c73e6
authorChad Versace <chadversary@google.com>
Mon, 23 Jan 2017 19:53:50 +0000 (19:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 19:53:50 +0000 (19:53 +0000)
am: a2c167bef6

Change-Id: I349e1177e9026bfcc78ab4cb25d27d11a4d11031


Trivial merge