tree 59288b2d560f033e452b8b3df1ac58c73cbcff9c
parent de9110790aa1b807afbafc7e2d78d97bbc352806
parent 1d78211ffb67e6bd90ef0502de5fb55fed926a95
author Remi NGUYEN VAN <reminv@google.com> 1620830575 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620830575 +0000

[automerger skipped] Merge "Move NetworkUtils JNI out of core/jni" am: 44862ff783 am: 0386387d39 am: 1d78211ffb -s ours

am skip reason: Merged-In I0b55dfe92f3cb6e848d79ac7953756f39aaa2597 with SHA-1 cdadd64b8d is already in history

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

Change-Id: I3724d722bc66d3c54fe1c8cebacc65c3c097e5f8