commit | a2f7cfae2001073c7fe4981e0f6400569b6a05a8 | [log] [tgz] |
---|---|---|
author | Anton Potapov <apotapov@google.com> | Wed Aug 02 13:29:23 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 02 13:29:23 2023 +0000 |
tree | f7c50b5ad2024434a0a8bf0a934987d6335fc526 | |
parent | f714ca7d6e037307aae78567d6ce93502d2b2689 [diff] | |
parent | 3aa758cebb1a0fdd3309248727c67cd04e667852 [diff] |
[automerger skipped] Merge "Add userId check before loading icon in Device Controls" into sc-dev am: 38e2c00694 am: f049b2096f -s ours am: 306f04b9c6 -s ours am: 5e764ff33d -s ours am: f6a0311dde -s ours am: 3aa758cebb -s ours am skip reason: Merged-In Ibe4fb69a90904787b9f97a7cd90d318a047d1e11 with SHA-1 2be24a7804 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23982204 Change-Id: Ifd01dc1e79339ceb6621c1fd1bbe657fcb4af160 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>