Merge "x11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223 am: 319a51d5dd...
authorChad Versace <chadversary@google.com>
Mon, 23 Jan 2017 20:03:35 +0000 (20:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 20:03:35 +0000 (20:03 +0000)
am: a366b6e884

Change-Id: I062cdcc67d83d37c5ccf2d4eb8a36a93f82e807c


Trivial merge