tree 8c0054de5550f90924788908089d34bdeb53646e
parent 8d83bc0aed0d8635c5b006d1248c3a4be328972a
parent d79bd5c622d7a76b37a71f8f131697cba079c6e9
author Chalard Jean <jchalard@google.com> 1627362735 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1627362735 +0000

Merge "Fix a possible system server crash" am: 51176d0a67 am: d79bd5c622

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1771187

Change-Id: Id71b3d6e530a053b1950ed9cecbf74a83b36b4e8