diff options
| author | 2023-08-01 16:56:55 +0000 | |
|---|---|---|
| committer | 2023-08-01 16:56:55 +0000 | |
| commit | 094b6cca2655cb94e96b8d84ed46a1ce9cf9b443 (patch) | |
| tree | a031671b394968581330f6260726a01a0e5df1fa /native/android/configuration.cpp | |
| parent | a1cf97d0f81d865c391ab740301a91d1dc3295cb (diff) | |
| parent | c96243ba20ce72ed3966bbc77a9fd41d830d774a (diff) | |
[automerger skipped] Merge "Add userId check before loading icon in Device Controls" into tm-dev am: cdd1be4645 am: 0b3edb1946 -s ours am: a6b7bb6a0c -s ours am: 7b492dd0a1 -s ours am: be99c8cf82 -s ours am: ba704fa2f3 -s ours am: c96243ba20 -s ours
am skip reason: Merged-In I60896a6f53307f0e97a9223b599a2891c6c0c08d with SHA-1 570aad7c61 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23982566
Change-Id: I997005f2a9e39598e235127dd9fd11b6673db5a5
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