tree 69e03837f1f2a305fba5e27a62f150b2c3d6b71d
parent aa6e56472690f1ca2ab4f4a4a5465aeea4a5f4ad
parent cef78638b5c689b5371557dea8ea0c35c6ad1741
author Paul Hu <paulhu@google.com> 1625628757 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1625628757 +0000

[automerger skipped] Merge "Use Netd new added/removed uid range methods" am: 51bfbbfb1b am: cef78638b5 -s ours

am skip reason: Merged-In I08bbdbcb8450b08e6208fa730137348550f9e3d2 with SHA-1 de2a23958d is already in history

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

Change-Id: Ifa99945cc5b761eb2f1a45c21838b5db078d584b