[automerger skipped] Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 93cec35cea am: b4093123de am: e13fa41a29 am: 722f9f4ea8 am: c0dbafc438 -s ours

Browse Source

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/+/1426565

Change-Id: Ie2c1e7c09dc8263f2230d708767866a43de0fa24

...

This commit is contained in:

Treehugger Robot

2020-09-29 06:04:30 +00:00

committed by Automerger Merge Worker

parent b2c1e02077 c0dbafc438

commit b1fcf50050

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available