diff options
| author | 2023-07-26 13:36:52 +0000 | |
|---|---|---|
| committer | 2023-07-26 13:36:52 +0000 | |
| commit | 8473da114494a6619a07798a3f0850488c694aec (patch) | |
| tree | 5c26899926a5e0ffef3b3e6598e43e9e20b113ef /libs/androidfw/AssetManager2.cpp | |
| parent | 9c5fbf1a5982f6c738681d93115de130ad7e9105 (diff) | |
| parent | 99a3db0ff8d2f931a90c0426e201ca048382bd75 (diff) | |
Merge "Merge "Add userId check before loading icon in Device Controls" into udc-dev am: d0f6b9acee am: 27ca2217b5 am: 0b02edde5f" into udc-qpr-dev-plus-aosp am: 99a3db0ff8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23891752
Change-Id: I2e831d8ac71e5b73a21e792dcc7391b200205cfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager2.cpp')
0 files changed, 0 insertions, 0 deletions