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

Change-Id: I3191b4256a031d3b100cff9eff1ee29923c032ef


No differences found