OSDN Git Service

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

Change-Id: Ia126d3684bea6fdf19c58bc98324b019265af859


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