summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-02 15:08:20 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-02 15:08:20 +0000
commitb30f0944d275fd5cd02b424eeae97753d37b01fe (patch)
tree112c404ac16f839ec71d6d098daf77d426630aaf
parenta932793a4e126a869250c4f929a5b22ac7f6461c (diff)
parentd30a214e5d4c0eb99ebe776d6bdc0b281fcb7cdf (diff)
Merge "[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: 72c2203bde -s ours" into udc-d1-dev-plus-aosp am: 7a32394af7 -s ours am: d30a214e5d -s ours
am skip reason: Merged-In I39b7bc62d82e20b5ba8747be13a2aa7bf21a59a2 with SHA-1 0c32739fab is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23982204 Change-Id: I1e058c32de079597ee32d4b22c1f04c74bf60cca Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions