OSDN Git Service

Merge "Call userActivity when dismissing keyguard" into nyc-mr1-dev
authorJorim Jaggi <jjaggi@google.com>
Fri, 5 Aug 2016 12:00:15 +0000 (12:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 Aug 2016 12:00:15 +0000 (12:00 +0000)
commit53b4a2d6cb9e3e0c65c7b9902dc37b6872421a88
tree53c127c82bf7c33c799f0214523d36ad8b3043c2
parentf564799b49a21a72d73eaf17bd48788ca4acfb70
parentb11cc6cbd370a991eea4d9fecaa1f0eee5f9002f
Merge "Call userActivity when dismissing keyguard" into nyc-mr1-dev
am: b11cc6cbd3

Change-Id: I0e7c8ea28b05bc4f5eaf5ba3234367372091b89c