OSDN Git Service

Merge "Update lock timeout value after pref change." into nyc-dev
authorJulia Reynolds <juliacr@google.com>
Thu, 12 May 2016 17:53:26 +0000 (17:53 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 12 May 2016 17:53:27 +0000 (17:53 +0000)
commit1590b8c0055057a392883fe891d21fc659b60813
treebfad7fbe9e00203b199b68b2c46a16e9aae90d65
parentaead073d4494c6b764cb384cdb96c79ec5a37aa5
parentde4f471e558620f2cce57b4160e3c728baef2fbb
Merge "Update lock timeout value after pref change." into nyc-dev