diff options
| author | 2023-08-03 05:45:10 +0000 | |
|---|---|---|
| committer | 2023-08-03 05:45:10 +0000 | |
| commit | a81a0656a3aaa4e477f30f46f8fe4e80c15602f4 (patch) | |
| tree | f434287ed401d3f20d2e076ed9eceef733866ddc /native/android/configuration.cpp | |
| parent | 2fa19b97385db2d9252a77040ac38ecf62e559a9 (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: I5e13894cdcde5454d3ab6e94b8048ad886ddef96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'native/android/configuration.cpp')
0 files changed, 0 insertions, 0 deletions