Merge "Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0...
authorTina Zhou <tinazh@google.com>
Mon, 23 Jan 2017 20:03:09 +0000 (20:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 20:03:09 +0000 (20:03 +0000)
am: 417cdbb829

Change-Id: Id426de0938d681c6e452a21f7d282d3e0650a2fd


Trivial merge