commit e76c52445c4f4e8d937e9dded3e1210bbd689e19
author Greg Hackmann <ghackmann@google.com> Fri Sep 25 00:15:10 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 25 00:15:10 2015 +0000
tree bf0897b41c1f652f2b86b868a9ab72e1f1ddc272
parent 0d31f0dd35b8c8eddcc591046fc468968f719a6f
parent f01dd38e73c053466e9857176c0eba1b9bd9d52e

am f01dd38e: Merge "Remove CpuFeaturesTest for tlsi" into mnc-dev

* commit 'f01dd38e73c053466e9857176c0eba1b9bd9d52e':
  Remove CpuFeaturesTest for tlsi

tests/tests/os/src/android/os/cts/CpuFeaturesTest.java

diff --git a/tests/tests/os/src/android/os/cts/CpuFeaturesTest.java b/tests/tests/os/src/android/os/cts/CpuFeaturesTest.java
index ecdb399..d8e128b 100644
--- a/tests/tests/os/src/android/os/cts/CpuFeaturesTest.java
+++ b/tests/tests/os/src/android/os/cts/CpuFeaturesTest.java
@@ -83,7 +83,7 @@
 
     private static final String[] armv8RequiredFeatures = {
             "half", "thumb", "fastmult", "vfp", "edsp", "neon",
-            "vfpv3", "tlsi", "vfpv4", "idiva", "idivt" };
+            "vfpv3", "vfpv4", "idiva", "idivt" };
 
     private static void assertInCpuinfo(List<String> features,
             String feature) {