Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949 am: 7b1b2...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 20:36:22 +0000 (20:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:36:22 +0000 (20:36 +0000)
am: eb4d5280cf

Change-Id: I78e1e5c0c71e787f0a37278e2e03bf8425cad17b


Trivial merge