OSDN Git Service

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

* commit '1590b8c0055057a392883fe891d21fc659b60813':
  Update lock timeout value after pref change.

Change-Id: Ie86247323910b78fe0623a011f677b4e4fd148d2


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