Merge "Call userActivity when dismissing keyguard" into nyc-mr1-dev

am: b11cc6cbd3

Change-Id: I0e7c8ea28b05bc4f5eaf5ba3234367372091b89c
This commit is contained in:
Jorim Jaggi
2016-08-05 12:00:15 +00:00
committed by android-build-merger

Diff Content Not Available