tree a36890cedd4ad19778c0fbcf48d08bb755fb08c1
parent ac9c0280dd23e2f80cda97415e6c7ec603b94d64
parent 2f62c391a10f1c330aff74694589c2fb921c6c34
author TreeHugger Robot <treehugger-gerrit@google.com> 1641870382 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1641870382 +0000

[automerger skipped] Merge "Fixed NPE when local or remote port range does not exist" into sc-v2-dev am: c7d8866a9b -s ours am: 2f62c391a1 -s ours

am skip reason: Merged-In I749f369c0daa5c840a77d37828f65e42262d85f5 with SHA-1 fb2ac71bd6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16601446

Change-Id: Ifc25e720c94ad593306d590230cc365a2ca8864c