| commit | 43a466ecdf52f1c60986a1023bb5ac96f631ecb5 | [log] [tgz] |
|---|---|---|
| author | Anton Potapov <apotapov@google.com> | Thu Aug 03 04:37:44 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 03 04:37:44 2023 +0000 |
| tree | e9579630e51f70ce60886777237bb522c29c0ed9 | |
| parent | a491053f1553ea5722ef3bdd98da6097f5103fb9 [diff] | |
| parent | 06b24f00f608b47880cb6d34e6259bbf66653595 [diff] |
[automerger skipped] [conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c93 am: 373c5ac49e -s ours am: 020addb64f -s ours am: d2983b8a0e -s ours am: a917310e04 -s ours am: 412ad58640 -s ours am: 06b24f00f6 -s ours am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e021f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454 Change-Id: I62e34fceba0f26f87ebfd5c43b36574ae2185c9b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>