tree d2421e5b54041a915c43d010bb8755c6f65cc5f1
parent db3611e6ec9ccdfc63c9c7bfb3f09bde6a2055ac
parent ae781e1b303873a5adcacaf71bb250b1bbc48c13
author Remi NGUYEN VAN <reminv@google.com> 1611212395 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1611212395 +0000

Merge "Mark TestNetworkManager as module API" am: 24ea1e0377 am: ae781e1b30

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I363b288609514251f1e5ec337f56368180d2b259