OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5ad66fc 9e38c73)
Merge "Update lock timeout value after pref change." into nyc-dev am: 1590b8c005
authorJulia Reynolds <juliacr@google.com>
Thu, 12 May 2016 17:58:30 +0000 (17:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 12 May 2016 17:58:30 +0000 (17:58 +0000)
am: 9e38c73cd2

* commit '9e38c73cd268d47be7864fe3da23d02d9506ca6e':
  Update lock timeout value after pref change.

Change-Id: I272dd4d3c5f5746eb4c3c9c6d5870c54402ae511


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