[automerger skipped] Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 177533ddbb am: fc6cb188b5 am: be8b195fe1 am: 2f068a914e am: 159de41477 -s ours am: a4dfd60335 -s ours

am skip reason: Change-Id Iabe24aef0b7a5c3aa9d7be275f0c4ed552cdd2e8 with SHA-1 933e4df3c9 is in history

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

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

Diff Content Not Available