Merge "Move apn settings to network" into pi-dev am: cf60ff7e08

am: 1dda7ae8b9

Change-Id: Ic94c8ac5f76c725ee5bc295bcb3dfb25a04a138b
This commit is contained in:
Pengquan Meng
2018-04-03 14:57:02 -07:00
committed by android-build-merger
7 changed files with 20 additions and 18 deletions

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings;
package com.android.settings.network;
import static com.google.common.truth.Truth.assertThat;
@@ -40,7 +40,8 @@ import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import com.android.settings.ApnEditor.ApnData;
import com.android.settings.R;
import com.android.settings.network.ApnEditor.ApnData;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -52,7 +53,6 @@ import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.RuntimeEnvironment;
@RunWith(SettingsRobolectricTestRunner.class)
public class ApnEditorTest {