tree d9b0f63b49fa1327c732b5c3019e00f0a9f471f8
parent 1941a166716bc5e38fcc746b525096f85303b2e4
parent cd37173df6570293a4ef9d072e42eca1f08d1d7f
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