commit e93a70a6a3b64b1279c8413e16bedba8dc60e806
author Wei Liu <luciferleo@google.com> Thu Nov 13 23:07:23 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 13 23:07:24 2014 +0000
tree 83d77372770630531bf75d575389624d323b963c
parent d7e74bd3fdac0b96c2efa0cfd343f260fb2e4755
parent 8b66b925698350ba2655601d6e437342d01027a0

Merge "Fix failing TextViewTest#testTextAttr " into lmp-sprout-dev

tests/tests/widget/res/layout/textview_layout.xml

diff --git a/tests/tests/widget/res/layout/textview_layout.xml b/tests/tests/widget/res/layout/textview_layout.xml
index 419bbf9..bf7f757 100644
--- a/tests/tests/widget/res/layout/textview_layout.xml
+++ b/tests/tests/widget/res/layout/textview_layout.xml
@@ -27,6 +27,7 @@
                 android:layout_height="match_parent">
 
             <TextView android:id="@+id/textview_textAttr"
+                    android:fontFamily="@null"
                     android:text="@string/text_view_hello"
                     android:textColor="@drawable/black"
                     android:textColorHighlight="@drawable/yellow"