Merge \\"Use GLIF theme for Settings > Security > Screen lock\\" into nyc-mr1-dev am: 223d45ea0e

am: 47e38646ed

Change-Id: If8a44dee9ba11281c9cc62b16b3599655c94724a
This commit is contained in:
Maurice Lam
2016-06-17 18:54:51 +00:00
committed by android-build-merger
26 changed files with 345 additions and 1140 deletions

View File

@@ -21,7 +21,7 @@
<item name="fingerprint_enroll_find_sensor" type="layout">@layout/fingerprint_enroll_find_sensor_base</item>
<item name="fingerprint_enroll_enrolling" type="layout">@layout/fingerprint_enroll_enrolling_base</item>
<item name="fingerprint_enroll_finish" type="layout">@layout/fingerprint_enroll_finish_base</item>
<item name="setup_choose_lock_pattern" type="layout">@layout/setup_choose_lock_pattern_common</item>
<item name="choose_lock_pattern" type="layout">@layout/choose_lock_pattern_common</item>
<item name="setup_fingerprint_enroll_find_sensor" type="layout">@layout/setup_fingerprint_enroll_find_sensor_base</item>
</resources>