summaryrefslogtreecommitdiff
path: root/native/android/configuration.cpp
diff options
context:
space:
mode:
author Anton Potapov <apotapov@google.com> 2023-08-01 16:58:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-01 16:58:50 +0000
commit89273d8095cedd56c350e20a01cf910a4142e6b2 (patch)
treea031671b394968581330f6260726a01a0e5df1fa /native/android/configuration.cpp
parent094b6cca2655cb94e96b8d84ed46a1ce9cf9b443 (diff)
parentf65fe54f0b0ce773d4430bb064aa32f1ea4adcf5 (diff)
[automerger skipped] Merge "Add userId check before loading icon in Device Controls" into tm-dev am: cdd1be4645 am: c8884c55e9 -s ours am: 91262ffdcb -s ours am: b221d1d697 -s ours am: 35b3568b0b -s ours am: f65fe54f0b -s ours
am skip reason: Merged-In I39b7bc62d82e20b5ba8747be13a2aa7bf21a59a2 with SHA-1 0c32739fab is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23982566 Change-Id: I08f8acb2266642e57161786791e99025e5180637 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