tree 103ebcb9eb4e72b135c05cedc26b376669a0bae9
parent d8f3bc4dff133b0e057cdbba284dd5562f250bb1
parent c75355ce48d386c501ab0b69a3146fde83d928ea
author Hai Zhang <zhanghai@google.com> 1559600080 -0700
committer android-build-merger <android-build-merger@google.com> 1559600080 -0700

Merge "Revert "Offload role manager work to background thread"" into qt-dev am: b13d88af52
am: c75355ce48

Change-Id: I4a82042c9bdd0419e5b3cfb9d1c4e08545bc025d