tree 595b45c1a477b9048aef0e28dec7aa1bbd1a209e
parent e570e80eb8cac662eadcdf05fadae73bd0760393
parent e0890849cd840fcf724d517f85624be461b8ae1b
author Treehugger Robot <treehugger-gerrit@google.com> 1601355644 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1601355644 +0000

Merge "[Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest" am: 27806fde5e am: e0890849cd

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

Change-Id: I88eeb86872e17fa03385dad601ed5e11f9b176d7