| commit | 248673e94f655c3393bd8f97235fa70c741d61f0 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Aug 03 15:15:18 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Aug 03 15:15:18 2017 +0000 |
| tree | 5eb8444d9a735e8d4eadd523bfe5c31443310fc9 | |
| parent | 8b62151c506496dc962996335d93816b66743b50 [diff] | |
| parent | 81eba9317bcd9a940a911efd9f89f269ca7378e4 [diff] |
Merge "Merge "Assist: Only call lockscreenShown when it is actually shown" into oc-dr1-dev am: bc3c1d0170 am: 2674ad2e9a" into oc-mr1-dev-plus-aosp