| commit | 17e0b2c547da46246b0a33fae9821c1cfa5f8502 | [log] [tgz] |
|---|---|---|
| author | Anton Potapov <apotapov@google.com> | Wed Aug 02 14:15:41 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 02 14:15:41 2023 +0000 |
| tree | cd2610a02e812c37e3e05e4d3641587c7d4b23b9 | |
| parent | 7a32394af7de5ac6a86c0d6b99ec381f6b136c20 [diff] | |
| parent | c8021523811953bc8f028f419f101feadee1b891 [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: 8eb9a03813 -s ours am: 3d10caad63 -s ours am: 05189c1215 -s ours am: c802152381 -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: I633834168c52724b5dc81895f3ec99a80f252baf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>