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

Change-Id: I44fe76bc54ae72df6bb2754e6d0369c0aef5bfb5


Trivial merge