[automerger skipped] Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest" am: 71c667322c am: 48c399c18a am: 7c9cc5621b am: 7f3bbcddf0 am: 7b7382fdf2 -s ours am: 87daeb4f31 -s ours

Browse Source

am skip reason: Change-Id I3d6c39f45cb1efb1742148f20f03372214eb0cbe with SHA-1 d2e9e42f32 is in history

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

Change-Id: Ifb8572119d82ec87c8f75f460bc75de4100d593f

...

This commit is contained in:

Treehugger Robot

2020-09-29 06:18:16 +00:00

committed by Automerger Merge Worker

parent 807f3b9040 87daeb4f31

commit 26febb5ef8

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