Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949 am: 7b1b2...
authorTina Zhou <tinazh@google.com>
Mon, 23 Jan 2017 19:59:11 +0000 (19:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 19:59:11 +0000 (19:59 +0000)
am: e721cf66ec

Change-Id: Ia4d02e6649ac403a91526ef28b37216b08556c33


Trivial merge