OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eb37daf e63322f)
am e63322f6: resolved conflicts for merge of f90628c6 to mnc-dr-dev
authorMaurice Lam <yukl@google.com>
Wed, 15 Jul 2015 22:32:43 +0000 (22:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 22:32:43 +0000 (22:32 +0000)
* commit 'e63322f640cf955ba296e064b07e4920d334f851':
  [Fingerprint] Export FingerprintEnrollIntroduction


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