OSDN Git Service

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)
commit5e933b5565d6cf327209a3171a4b2659478ec045
tree9fae73daefcb6adb2749979cd639c0e66536d280
parent5ad66fcb3cbd16304608e92d2a7a2e78e45b50fe
parent9e38c73cd268d47be7864fe3da23d02d9506ca6e
Merge "Update lock timeout value after pref change." into nyc-dev am: 1590b8c005
am: 9e38c73cd2

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

Change-Id: I272dd4d3c5f5746eb4c3c9c6d5870c54402ae511