tree 1f86c23537c515b4c8b26bbbdb8d537ef51822a3
parent 4290766ae71e29c9e611b5c42e48b03c33df13d2
parent 9641e3404c139d9cf11bba66839859bc1adb08b8
author Remi NGUYEN VAN <reminv@google.com> 1617930522 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1617930522 +0000

Merge "Add RequiresPermission to TestNetworkManager" am: 9641e3404c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669187

Change-Id: I3ea1379e439a1dfda99e9332275ea38efed86f4f