Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0 am: 7bb50...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 20:43:47 +0000 (20:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:43:47 +0000 (20:43 +0000)
am: af1267ba5f

Change-Id: I2690658581e2641cd61282e22e8ad37c3b3dc958


Trivial merge