Merge "Revert "Display and parse numbers properly in all locales"" into oc-dev am: 30e9474dbb

am: 87603385b7

Change-Id: I64197acec6cb6cc055b496198b01c954c4c1907f
This commit is contained in:
Fan Zhang
2017-04-28 23:43:21 +00:00
committed by android-build-merger
2 changed files with 18 additions and 25 deletions

View File

@@ -16,17 +16,16 @@
package com.android.settings.utils;
import com.android.settings.TestConfig;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.fail;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
@RunWith(RobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ThreadUtilsTest {