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:30:59 +0000 (20:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Nov 2016 20:30:59 +0000 (20:30 +0000)
am: c447d9ef6a

Change-Id: I17a831ab2c537c00452f250d151ec3f63b2d6277


Trivial merge