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

Change-Id: Iadf1e0c66d1eb783f4ba06f05d9f4761ad7a4ff2


Trivial merge