| commit | dcd37245f6056942f7769da4fd6379db5d718430 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Thu Aug 03 15:26:17 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 03 15:26:17 2017 +0000 |
| tree | b637529f3720bfed6515197891676c1cdd4bd93c | |
| parent | 3c885060e34b0fe791b0d65199f499248c368ea9 [diff] | |
| parent | 248673e94f655c3393bd8f97235fa70c741d61f0 [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 am: 248673e94f Change-Id: I550c0b28dfcd9f9a34bb02f666d88dbd5882f200