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

Change-Id: I1f2ecb78180c0f911844355d7ca838642d22b770


Trivial merge