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

Change-Id: Ic16c4f83b7c340b0685d11a1cebb2b6abcf938dd


Trivial merge