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

am: 0cbe2e1a5c

Change-Id: I98803fd185b5d523e5aec610d29c112ee78a6254
This commit is contained in:
Greg Plesur
2016-11-03 20:37:33 +00:00
committed by android-build-merger

Diff Content Not Available