From: Siyamed Sinir <siyamed@google.com>
Date: Thu, 30 Jun 2016 18:48:12 +0000 (+0000)
Subject: Merge "Enable Text core tests"
X-Git-Tag: android-x86-8.1-r1~13843
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f1cee7a5869161a5fd27f6a6257670459e8f4cf2;p=android-x86%2Fframeworks-base.git

Merge "Enable Text core tests"
---

f1cee7a5869161a5fd27f6a6257670459e8f4cf2
diff --cc core/tests/coretests/src/android/text/format/DateUtilsTest.java
index 20e19c95001a,798d26871a07..79e2af30cad5
--- a/core/tests/coretests/src/android/text/format/DateUtilsTest.java
+++ b/core/tests/coretests/src/android/text/format/DateUtilsTest.java
@@@ -16,10 -16,8 +16,10 @@@
  
  package android.text.format;
  
- import android.test.suitebuilder.annotation.SmallTest;
+ import android.support.test.filters.SmallTest;
  
 +import java.util.Locale;
 +
  import junit.framework.TestCase;
  
  public class DateUtilsTest extends TestCase {