tree 0a61729f6c7a9b2a42261b24b413f6b970312bf6
parent b01cafdb08a68740c3591edba601a5d00819216d
parent cb5c2e141e53de673e202d9fbb8468446d47f865
author Treehugger Robot <treehugger-gerrit@google.com> 1616174489 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1616174489 +0000

Merge "Fix InetAddressCompat exception handling" am: cd37173df6

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

Change-Id: I1d65d6b011e5ce585835e1c9df9eea0afb74b0f4