tree a731b2b0ba92e4a1571e121f6ef13863b1671fce
parent 1474024e5955285ed5185c38c25ad421892a20b4
parent 94c8957576c23e647229d4e8f6c45f7f8f8bf9a2
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: 94c8957576

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

Change-Id: I3ea1379e439a1dfda99e9332275ea38efed86f4f