| commit | 7eef1b9c17c7c112ca3dc8e6e87fc51118600085 | [log] [tgz] |
|---|---|---|
| author | Peter Kalauskas <peskal@google.com> | Fri Sep 17 22:50:55 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 17 22:50:55 2021 +0000 |
| tree | f98260f068a609ff8235221991eff13853a00ade | |
| parent | e78c7c07653e3b4ffa8c0a58709ac8b472408c7c [diff] | |
| parent | 2c5f0499ea0cc5404b0cf34703957b5ce8e96a33 [diff] |
[automerger skipped] Merge "Move keyguard multi-user icon into container view" into sc-qpr1-dev am: d7997c2497 am: 2c5f0499ea -s ours am skip reason: Merged-In Iadbd29bd7c50cd20a86f966d3f7ec69cd78c9744 with SHA-1 56276a2cc5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15854527 Change-Id: I0224164e104cdc6d8973329de529384258be632e