OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 78ed71c e1548ab)
am e1548aba: (-s ours) am 88832a3d: Merge "[Fingerprint] Disable back in setup enroll...
authorMaurice Lam <yukl@google.com>
Thu, 27 Aug 2015 11:35:01 +0000 (11:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:35:01 +0000 (11:35 +0000)
* commit 'e1548aba28e5362d35e6980c9238b783ef3426a0':


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help