OSDN Git Service

Merge "New Wear devices need to update their DISABLE_LOCKSCREEN_KEY." into cw-f-dev
authorGreg Plesur <plesur@google.com>
Thu, 3 Nov 2016 20:15:15 +0000 (20:15 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 3 Nov 2016 20:15:21 +0000 (20:15 +0000)

Trivial merge