Merge "Merge "Update lock timeout value after pref change." into nyc-dev am: 1590b8c005
am: d9dffc6080" into nyc-mr1-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
197dc19e57