tree c20e3f9b9a3d1486bad8ad9ee287fea33f2d2048
parent e269901767ed9f699fd94c710631fbd03037d01b
parent 2e73c7a013b7fe99e6267c75bd78d18b2f5024e8
author Lorenzo Colitti <lorenzo@google.com> 1625035375 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1625035375 +0000

Merge "Suppress NewApi lint errors in NetworkMonitor test." am: 5d71e47dc1 am: 2e73c7a013

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

Change-Id: Ib1f53a5ec2b638b39bb22d23a3396076b110ab05