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

Change-Id: Ie2e307010f7bef574a5a2b97364f7a4f8e42a745


Trivial merge