Commit a9764560 authored Jun 18, 2020 by Lorenzo Colitti Committed by Automerger Merge Worker Jun 18, 2020

Merge "Jarjar frameworks/libs/net in NetworkStack module" into rvc-dev am:...

Merge "Jarjar frameworks/libs/net in NetworkStack module" into rvc-dev am: def2536a am: 9aaf6676 am: cbcfa2f9

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11867583

Change-Id: I0b075eaa67ea845be9820bc4e04353a5b6edfb75

jarjar-rules-shared.txt

+3 −0

Original line number	Original line	Diff line number	Diff line
			# Classes from net-utils-framework-common
			rule com.android.net.module.util.** com.android.networkstack.util.@1

	rule com.android.internal.util.** android.net.networkstack.util.@1		rule com.android.internal.util.** android.net.networkstack.util.@1

	rule android.net.shared.Inet4AddressUtils* android.net.networkstack.shared.Inet4AddressUtils@1		rule android.net.shared.Inet4AddressUtils* android.net.networkstack.shared.Inet4AddressUtils@1