commit | 355bb79a861511cfa8fdc10a96aea1047f9928a1 | [log] [tgz] |
---|---|---|
author | Anton Potapov <apotapov@google.com> | Tue Aug 01 20:47:46 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 01 20:47:46 2023 +0000 |
tree | e19ab4d45b426a260f964b32a082be96a7a5710c | |
parent | 173347177054b78911ede365bda93fefff42ea55 [diff] | |
parent | c94c6329896f28d76b056eff1fb3d50c74b86f0d [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: 6394c42623 -s ours am: 72b88be502 -s ours am: 1e2468f4d6 -s ours am: 178a958149 -s ours am: c94c632989 -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: I8a9545ddec6e416b699b4451d7f01b3a04118fc8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>