tree 32fca62cfb69a93b0cf68a118dace4a67a4e4d1b
parent 794e66cfd270c4ab5ab2db614f6561c1e48316ba
parent 0cbe2e1a5c8c708054ea37588f3bb7b91089e604
author Greg Plesur <plesur@google.com> 1478205453 +0000
committer android-build-merger <android-build-merger@google.com> 1478205453 +0000

Merge "New Wear devices need to update their DISABLE_LOCKSCREEN_KEY." into cw-f-dev am: 343dbac2e0 am: c447d9ef6a
am: 0cbe2e1a5c

Change-Id: I98803fd185b5d523e5aec610d29c112ee78a6254