OSDN Git Service

Merge tag 'android-6.0.1_r74' into HEAD
authorJessica Wagantall <jwagantall@cyngn.com>
Wed, 9 Nov 2016 19:54:56 +0000 (11:54 -0800)
committerJessica Wagantall <jwagantall@cyngn.com>
Wed, 9 Nov 2016 19:59:19 +0000 (11:59 -0800)
commit9f5f2fb943fa14aa775291a373fa67b1ae4a2a60
tree89ec0a2e190f7507dea82f69fc12b0d91e8f469e
parent7955711d5f9f55e889f65a8ec48c812ff900c4b3
parent094752f5a1257d77fc9454dad63f87dbe0dbc5be
Merge tag 'android-6.0.1_r74' into HEAD

CYNGNOS-3303

Android 6.0.1 release 74

Change-Id: Id902564eaffb5084650acbee5f9b853fba21cc86
src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java