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

Change-Id: I5e025c77c065511b2ba6ef04f13488328c2a586c


Trivial merge