diff options
| author | 2023-08-01 16:58:49 +0000 | |
|---|---|---|
| committer | 2023-08-01 16:58:49 +0000 | |
| commit | a6e40febec46b089dc8c13f5233a2a01079ccc18 (patch) | |
| tree | 63b38abb0c509d4c617482d86daf14fcc7525204 /native/android/configuration.cpp | |
| parent | 3c4fb7a39e58e3dc839295e81571a1145da89ce5 (diff) | |
| parent | 72738f6f96d7470303c0bbe2acdfe6bf8306bbfa (diff) | |
Merge "[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" into udc-d1-dev-plus-aosp am: 72738f6f96 -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: Ic1230627ed29b735fad7acf41318bc4adae1c14e
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