Merge "Merge "Use config_headlineFontFamily for password screens." into oc-dr1-dev am: 4545d636ec" into oc-dr1-dev-plus-aosp

am: 0ee38fa7eb

Change-Id: I95f9a51aee9542cb2ff99043fd305760e276f108
This commit is contained in:
Andrew Sapperstein
2017-07-07 03:33:25 +00:00
committed by android-build-merger
7 changed files with 11 additions and 4 deletions

View File

@@ -79,6 +79,7 @@
<item name="android:gravity">center</item>
<item name="android:singleLine">true</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textSize">24sp</item>
</style>
<style name="TextAppearance.CryptKeeper_PasswordEntry" parent="android:TextAppearance.Material">