Merge "Do not launch assistant via long press when device is locked." into cw-f-dev

am: 2ab563ec6a

Change-Id: I704706ad32b64c4b28ded7b6423300b78ae7762e
This commit is contained in:
Nancy Zheng
2016-09-29 18:32:55 +00:00
committed by android-build-merger

Diff Content Not Available