tree edb7402c8dbafff7acc19d1c38ab48b2c037a495
parent ed78622233d53b2c3ae7dc8b29b8114f989c106c
parent 91bb146dd042633d9594c3e41a25457a5cf4ae4a
author android-build-team Robot <android-build-team-robot@google.com> 1525371562 -0700
committer android-build-merger <android-build-merger@google.com> 1525371562 -0700

Merge "Resets system flags when updating PackageSettings" into pi-dev am: f8f6e5af75
am: 91bb146dd0

Change-Id: Ibb8f601122bd57972eb8b03051c166e699b3d220