OSDN Git Service

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)
commitd9dffc608099297fbadabc1f9f72659955de5707
tree6556e937dd8fd0472d02aa5dee10349812d0e776
parent3fdb526bbd7959ea5959922d86387232063b91a9
parent1590b8c0055057a392883fe891d21fc659b60813
Merge "Update lock timeout value after pref change." into nyc-dev
am: 1590b8c005

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

Change-Id: Ib9da57d196586c76133dd25e918c92c05bc08eba