Julia Reynolds 42285400e2 Merge "Update lock timeout value after pref change." into nyc-dev am: 1590b8c005 am: 9e38c73cd2 ...

am: 5e933b5565

* commit '5e933b5565d6cf327209a3171a4b2659478ec045':
  Update lock timeout value after pref change.

Change-Id: I73288fdf3e24db764a8500308f681e12dcb6d492

2016-05-12 18:01:08 +00:00

..

android/settings

Merge "Update lock timeout value after pref change." into nyc-dev am: 1590b8c005 am: 9e38c73cd2

2016-05-12 18:01:08 +00:00