summaryrefslogtreecommitdiff
path: root/native/android/configuration.cpp
diff options
context:
space:
mode:
author Anton Potapov <apotapov@google.com> 2023-08-01 17:16:10 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-01 17:16:10 +0000
commitd52517f3b902cff915ecec2aa36e4d8989bc7cdf (patch)
treea031671b394968581330f6260726a01a0e5df1fa /native/android/configuration.cpp
parent89273d8095cedd56c350e20a01cf910a4142e6b2 (diff)
parent3c4fb7a39e58e3dc839295e81571a1145da89ce5 (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: ce126ccdfe -s ours am: 074e276b80 -s ours am: 3c4fb7a39e -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: Iec4322f68b8ebec2c57da450b09a7c1df2c83d00 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