commit | 4bd15ba4c12b2aa35f416c0f8991173c63fc62d5 | [log] [tgz] |
---|---|---|
author | Anton Potapov <apotapov@google.com> | Tue Aug 01 19:59:41 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 01 19:59:41 2023 +0000 |
tree | 8877f71f022e76dc54724b399495a8c71059d3d9 | |
parent | 5173da0c076c5cbe0d9994bc09d8fd5d6763beaf [diff] | |
parent | 9f3c93f5e3f68e8207888efa51ca464de9ff189d [diff] |
[automerger skipped] Merge "Add userId check before loading icon in Device Controls" into sc-v2-dev am: fee30bd247 -s ours am: 16f950f41f -s ours am: 31c96f00e1 -s ours am: 7bf8adb31e -s ours am: 956623c6c0 -s ours am: 823f6c0c1b -s ours am: 9f3c93f5e3 -s ours am skip reason: Merged-In Ib0e677f7ccbed6299ea07939519c7dcf6d371bec with SHA-1 22f97f081c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23981526 Change-Id: I3ea5f514e84fddf9f2f37a75f552044bdc1e561d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>