Merge "Add help info at the bottom of the dialog"

2018-01-06 00:15:43 +00:00
parent de4bef0243 fd69cd4c33
commit 39e6bc2356
6 changed files with 191 additions and 114 deletions
--- a/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogFragmentTest.java
@@ -50,7 +50,6 @@ public class PrivateDnsModeDialogFragmentTest {
    private PrivateDnsModeDialogFragment mFragment;
    private Button mSaveButton;

-
    @Before
    public void setUp() {
        MockitoAnnotations.initMocks(this);