OSDN Git Service

Merge "Merge "Update lock timeout value after pref change." into nyc-dev am: 1590b8c0...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Thu, 12 May 2016 17:58:43 +0000 (17:58 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 12 May 2016 17:58:43 +0000 (17:58 +0000)

Trivial merge