tree 14a8728963df89ea2c20d106ef63290913f3fa3d
parent f08493be2f0f158dc44abde7cd810d73e8b36a49
parent 478733ce72dcf734c3d48c26e7ed2320faf938ea
author Aaron Huang <huangaaron@google.com> 1631882667 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1631882667 +0000

Merge "Remove forceAllNetworkTypes from test" am: bc48cdaf46 am: 478733ce72

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

Change-Id: I3271a1dacea9e99c70b4d23d0cb2aea9a82a4678