OSDN Git Service

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

Change-Id: I19d1bacf055fb660d4ce829222662abfafb9c4a8


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