tree e8d1947334144449074ccb3735e6d3fc28dea4b1
parent ce8bdbdc3b95549fc2fd395a0318b327e23fb67a
parent 0ffc43e86a1c7dd950b7d3987083ee45b2c25061
author Steven Moreland <smoreland@google.com> 1572647884 -0700
committer android-build-merger <android-build-merger@google.com> 1572647884 -0700

Merge "servicemanager: avoid segfault on null manifest." am: e4d836a41f am: 6a52945988
am: 0ffc43e86a

Change-Id: Ic980783663e47228e1a82eaf390efa2e13e00306