OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9245b98 62158f0)
[automerger skipped] Merge "DO NOT MERGE Disable changing lock when device is not...
authorDoris Ling <dling@google.com>
Thu, 9 Aug 2018 22:19:19 +0000 (15:19 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 9 Aug 2018 22:19:19 +0000 (15:19 -0700)
am: 62158f0943  -s ours

Change-Id: I892834c6c0655f40954ee94d98b29ac271b3de4c


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