Merge "Merge "Update lock timeout value after pref change." into nyc-dev am: 1590b8c005 am: d9dffc6080" into nyc-mr1-dev-plus-aosp

am: 197dc19e57

* commit '197dc19e5747b894cfa21b1f21e6017c6064ffe4':

Change-Id: Ic0ab984f4c1d8303a9c338a6b53228163dd09573
This commit is contained in:
Julia Reynolds
2016-05-12 18:01:09 +00:00
committed by android-build-merger

Diff Content Not Available