Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: f1dcdc55d5
authorTina Zhou <tinazh@google.com>
Mon, 23 Jan 2017 19:26:10 +0000 (19:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 19:26:10 +0000 (19:26 +0000)
am: 011e9a2331

Change-Id: I22272cc5f66c360d4bb6245dbd9f806414c49ae7


Trivial merge