OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c29df37 c9f9961)
Merge "Remove duplicates in Security Settings" into oc-dev am: 96a8dffafb
authorMatthew Fritze <mfritze@google.com>
Tue, 23 May 2017 22:27:01 +0000 (22:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 May 2017 22:27:01 +0000 (22:27 +0000)
am: c9f9961d8d  -s ours

Change-Id: Ia3d2431248eb95bcea9f1b95602e3ba6a2ef0171


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