tree 87f79599833fd6e2bd8128d3b900a4cbb2d326f2
parent a3f610a7b2786d5e30218fe02838fd4042c2ef53
parent b2d124c0c8ac2950e7ac2f6cb38413629251d9cf
author Xin Li <delphij@google.com> 1613975918 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613975918 +0000

[automerger skipped] Skip ab/7061308 in stage. am: b2d124c0c8 -s ours

am skip reason: Change-Id I04ef025ed537623511a3d346d4c59d6efb6bef3f with SHA-1 8e1e05ec1e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id70404269c79a1c211628e04ed90dad9aeb8676a