Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: f1dcdc55d5 am: 011e9...
authorTina Zhou <tinazh@google.com>
Mon, 23 Jan 2017 19:35:05 +0000 (19:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 19:35:05 +0000 (19:35 +0000)
commit80b7cbe0fb99c2cdab90cafbce290dcf61b106eb
tree99b6e588908ee04c25c33c25067919c1eeaa39a5
parent15f8a6d785f74524b305e4cf2152c10944404c28
parent7212d761317c9b7b43b2a9c27acfd5da0eae1de1
Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: f1dcdc55d5 am: 011e9a2331 am: 2c73a05f63
am: 7212d76131

Change-Id: I37020291dc4fe7447c096bf451ce6ef197d3f7a3