Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea
authorTina Zhou <tinazh@google.com>
Mon, 23 Jan 2017 19:24:38 +0000 (19:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 19:24:38 +0000 (19:24 +0000)
commit7b1b2f450973c1fd21652ab73871f6b939489379
tree82d3b6e7491dbd9e1b2aa5fa3b29dcbc729fd923
parent1eb4f43dc45d8d614206c0aaedfc6a647af5cb8d
parentb6766f994937879ff462037b03c211b8f5d43b2b
Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea
am: b6766f9949

Change-Id: I3191b4256a031d3b100cff9eff1ee29923c032ef