| commit | 412ad58640cbb293176e738ed68110a97f5b0528 | [log] [tgz] |
|---|---|---|
| author | Anton Potapov <apotapov@google.com> | Thu Aug 03 03:11:48 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 03 03:11:48 2023 +0000 |
| tree | 909683d219412a132783f1b45c9671ab0dbe5687 | |
| parent | 8badb22c1e0ad6ce7f625ac8510b68b5fe712305 [diff] | |
| parent | a917310e04c8bf498f6185e08fbe50550fdd7b4f [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 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: I52df5a6f1232474b6e9870703ef6fac2d5cd14d7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>