commit | 01f00449833dc8afa47ec7ddd6d091d65188f63b | [log] [tgz] |
---|---|---|
author | Jorim Jaggi <jjaggi@google.com> | Fri Aug 05 12:13:44 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Aug 05 12:13:44 2016 +0000 |
tree | 600c96273ca3499666b442f99b7a398347545aa3 | |
parent | 356955e9e5d6edfea55d699afe8b68f0744dee5a [diff] | |
parent | 10dcc0eb992b9621ad59cd0841c7b402c6acdddf [diff] |
Merge "Call userActivity when dismissing keyguard" into nyc-mr1-dev am: b11cc6cbd3 am: 53b4a2d6cb am: 10dcc0eb99 Change-Id: Ib7a198e0c1ad0ecc3090799933d9cae3eb84b42a