| commit | 9e38c73cd268d47be7864fe3da23d02d9506ca6e | [log] [tgz] |
|---|---|---|
| author | Julia Reynolds <juliacr@google.com> | Thu May 12 17:55:56 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 12 17:55:56 2016 +0000 |
| tree | 144c5e0a66972103b76c8db7aab5d98f7a62562c | |
| parent | d0035fd621f10cb6a54f32a34c304c7e079f8497 [diff] | |
| parent | 1590b8c0055057a392883fe891d21fc659b60813 [diff] |
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