tree ee09d076454b3e6ed6df59ffe5a7eab07d85a3d7
parent 6c92756b1d540221535c2baa0427d66ef12bc0d3
parent 5eb34a7418444ccff82e763579134060e7421bcd
author Marco Nelissen <marcone@google.com> 1572034427 -0700
committer android-build-merger <android-build-merger@google.com> 1572034427 -0700

[automerger skipped] Merge "DO NOT MERGE: Visualizer: Fix deadlock on close" am: f65c700c29 am: 001b864640 am: a08a1544b6
am: 5eb34a7418 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib80b932bb0553130ed6e2c69e4f8ac433a3b2ad8