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

Change-Id: I5db3ec87559ca4d31bccf001c7bfc8cf74bf2710


Trivial merge