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)
commit9e38c73cd268d47be7864fe3da23d02d9506ca6e
tree144c5e0a66972103b76c8db7aab5d98f7a62562c
parentd0035fd621f10cb6a54f32a34c304c7e079f8497
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: Ie86247323910b78fe0623a011f677b4e4fd148d2