OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 470dc12 17bb961)
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am: c07f39c791...
authorSteven Ng <stevenckng@google.com>
Tue, 16 May 2017 21:43:48 +0000 (21:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 16 May 2017 21:43:48 +0000 (21:43 +0000)
am: 17bb961066  -s ours

Change-Id: I650ce37d934f2ca30f5d5bd3122593f0c4553b50


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