tree 55d3086ff2e4f3a6fdbd5526c2136127f6f57747
parent 81e5fce398a8d73e3715297d2bbbefdd76acb84c
parent dc4d184e1570d74f7c7cf2cbb26f0904e4618ded
author android-build-team Robot <android-build-team-robot@google.com> 1525165679 -0700
committer android-build-merger <android-build-merger@google.com> 1525165679 -0700

Merge "Fix an NPE in PackageManagerService (introduced by ag/3819668)" into pi-dev am: e4d1cabe45
am: dc4d184e15

Change-Id: Id5bd7fdd238482ad0265feac78636adaf4e2a1fb