Merge "Display and parse numbers properly in all locales" into oc-dev am: 28e5271c61

am: feea41f6cc

Change-Id: I3d9ffaa6f13a1d2859c6d591dfcb1c573c7cd11e
This commit is contained in:
Fan Zhang
2017-04-20 00:57:30 +00:00
committed by android-build-merger
2 changed files with 25 additions and 18 deletions

View File

@@ -16,16 +16,17 @@
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;
@RunWith(RobolectricTestRunner.class)
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)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ThreadUtilsTest {