OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eba886f 0bde6dc)
Merge "Do not show options if screen lock types is empty" into oc-dr1-dev
authorAjay Nadathur <ajayns@google.com>
Wed, 12 Jul 2017 18:04:26 +0000 (18:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Jul 2017 18:04:26 +0000 (18:04 +0000)
am: 0bde6dcb18

Change-Id: I7b2ba35b04f53e28ad98eec54b8fe42811a6eb8d


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