[automerger skipped] Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" am: 3eeb8b44c2 am: 27978c5d47 am: 5f81bb9a07 am: bb98b793e5 am: 6ace0ecdde -s ours

am skip reason: Change-Id Ic66425aca4047d2eacd04509f3bfb315f6dd57fc with SHA-1 a1aaccf670 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426552

Change-Id: Iab38a1060b1fb43dc105da9a095d587b2a241fe5
This commit is contained in:
Treehugger Robot
2020-09-29 06:04:04 +00:00
committed by Automerger Merge Worker

Diff Content Not Available