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

Change-Id: I4dbf6304cc45abed3baee0da9ae7b16d0d3702d5


Trivial merge