tree 43cdfe40d419e67a2e381d061035fe4714f0ca5c
parent 6439337ceeba6e2643148a61c98e2449d3ffe4b9
parent 1d3d19f2e12c584dce9b593d6086b2a8601005ab
author Winson Chung <winsonc@google.com> 1564160448 -0700
committer android-build-merger <android-build-merger@google.com> 1564160448 -0700

Merge "Fix NPE in service dump" into ub-launcher3-qt-r1-dev
am: 1d3d19f2e1

Change-Id: I031c5466fabd2992bbef8b1cfb0f7de5bdbfad10