diff options
| author | 2023-08-01 17:04:42 +0000 | |
|---|---|---|
| committer | 2023-08-01 17:04:42 +0000 | |
| commit | 10635548b4889b837d789c0ef8ece2091ad409ca (patch) | |
| tree | 63b38abb0c509d4c617482d86daf14fcc7525204 /libs/androidfw/AssetsProvider.cpp | |
| parent | b8a98662b1b0371e61c554ad1fd0a0ff37b305ee (diff) | |
| parent | e1533051a585480ed1bf64a7ff262043338c03f3 (diff) | |
Merge "[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" into udc-d1-dev-plus-aosp am: e1533051a5 -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: Iff193036b6b3a82f4aeaca17c67013b4843ec878
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions