OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9f5f2fb) | patch
Settings: Fix mismerge
authorBruno Martins <bgcngm@gmail.com>
Thu, 10 Nov 2016 00:26:37 +0000 (00:26 +0000)
committerDan Pasanen <invisiblek@cyanogenmod.org>
Thu, 10 Nov 2016 02:20:43 +0000 (19:20 -0700)
commitf6d341de9c5d0cff71544261d10c8375a9d67b7c
tree4cc273dfacb835c84ed2c2745d8ba598f86be7ebtree | snapshot
parent9f5f2fb943fa14aa775291a373fa67b1ae4a2a60commit | diff
Settings: Fix mismerge

 * This was wrongly added during merge of tag 'android-6.0.1_r74'

Change-Id: I43f10016b69b4680da01be77ecb5fbb7e84a7429
src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java diff | blob | history
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help