commit 93a2f19f5fd3df5cb9329c8da53d709f9d60437c
author TreeHugger Robot <treehugger-gerrit@google.com> Wed May 24 08:07:29 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 24 08:07:35 2017 +0000
tree aca5d08c048eaafbd78b775bd6d7c2ee7316c27e
parent 31f6a3dc8b7e87deee102cbc20611572536acb3a
parent 518ae84c2b431cf00be84d825def44393d55cac2

Merge "Fix crash due to bad maxLines defined for dialog titles on watch type devices." into oc-dev

core/res/res/values-watch/styles_material.xml

diff --git a/core/res/res/values-watch/styles_material.xml b/core/res/res/values-watch/styles_material.xml
index 0053c12..fd88102 100644
--- a/core/res/res/values-watch/styles_material.xml
+++ b/core/res/res/values-watch/styles_material.xml
@@ -95,7 +95,7 @@
     </style>
 
     <style name="DialogWindowTitle.Material">
-        <item name="maxLines">@empty</item>
+        <item name="maxLines">@null</item>
         <item name="scrollHorizontally">false</item>
         <item name="textAppearance">@style/TextAppearance.Material.DialogWindowTitle</item>
         <item name="gravity">center_horizontal|top</item>