| commit | 7ffebb228c24c99b78451afb8031f9918d64a84d | [log] [tgz] |
|---|---|---|
| author | Anton Potapov <apotapov@google.com> | Thu Aug 03 05:44:02 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 03 05:44:02 2023 +0000 |
| tree | de8ac51d0f72a0e0eddc74542acb4476031fce2a | |
| parent | 30aabba4d2bfaab9f03e2d3dfe6070ed070abc8d [diff] | |
| parent | fc4530d666f05f9ce76e9530d409f608f2c9c96d [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: 43a466ecdf -s ours am: fc4530d666 -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: If64741aa10068e122a4c0f4ddd3bc8738fdd32a4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>