Commit 52fa8122 authored Nov 05, 2020 by Aaron Huang Committed by Automerger Merge Worker Nov 05, 2020

Merge "Remove duplicate jarjar rule" am: 49e78fe4 am: d3136119

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

Change-Id: Ic6901c858c3a1c0b57f503187ac4d1a37734946d

parents 2e193aff d3136119

jarjar-rules-shared.txt

+0 −3

Original line number	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.google.protobuf.** com.android.networkstack.protobuf.@1