| commit | d2708119203353c715b7e3ae1d67e15520a94a18 | [log] [tgz] |
|---|---|---|
| author | Anton Potapov <apotapov@google.com> | Thu Aug 03 06:10:44 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 03 06:10:44 2023 +0000 |
| tree | 8413ececf10d6fe4ea7872d3be668cb809418337 | |
| parent | 313643111df7dc66f414c6b5a3e7d45133432ee4 [diff] | |
| parent | 7ffebb228c24c99b78451afb8031f9918d64a84d [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: 7ffebb228c -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: I09267d654fd8a670b2f936a6665a1f98d0f9ee6f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>