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:
Android Build Merger (Role)
2016-05-12 17:58:43 +00:00
committed by Android (Google) Code Review

Diff Content Not Available