tree e4c9ed9a9cd94920c0ef8ca217898e501992e405
parent 02a9aec015a9fb98534f42cd4fb500ef574c5550
parent a7d12b227f2b66dee15ae51d74676e5529e860e7
author Winson Chung <winsonc@google.com> 1564160985 -0700
committer android-build-merger <android-build-merger@google.com> 1564160985 -0700

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

Change-Id: Ic97e416874c2989ab293b69d54190a02f281a043