OSDN Git Service

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

Change-Id: I3c13ee22f6e19d1ba45dd9fc34489d45c887ef35


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