| commit | 8eaf10e07f346976bff25ae2cbb8eb41f3e244ff | [log] [tgz] |
|---|---|---|
| author | Matthew Ng <ngmatthew@google.com> | Fri Apr 28 18:33:54 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Apr 28 18:33:54 2017 +0000 |
| tree | 7f2d2fb38d05ead15fd93b927fd064a7eb63ba04 | |
| parent | 5cf5494744476e34c9a5e9e55f4f65799fea43d1 [diff] | |
| parent | ed6e67388ee8373ebc3c5e577486f0a23d5ff605 [diff] |
Merge "Dismiss docked stack when ShowWhenLocked activity is over keyguard (1/2)" into oc-dev am: ba836ad1fa am: ed6e67388e Change-Id: Iaad787457b787dbbdc984aaf7009895c4c6d3091