diff options
| author | 2023-05-09 18:49:09 +0000 | |
|---|---|---|
| committer | 2023-05-09 18:49:09 +0000 | |
| commit | 2c81f5451cc35bac88021f5901d9534eba642ef5 (patch) | |
| tree | 5a9bcc4336da1f7005790b632fe6811c30952ed8 /libs/androidfw/AssetManager2.cpp | |
| parent | 38a59f65337da909213009a88427d2b92580ffbc (diff) | |
| parent | b6887951bfdfaa9ed208c77728021b1abe84f6f6 (diff) | |
Merge "Merge "Verify URI permissions for notification shortcutIcon." into sc-dev am: 10ce511ed9 am: 2f2f8155b2 am: d07bdb1979 am: 82fb81741a am: 063800db34 am: 2073ca0a96" into udc-dev am: c271d30bf4 am: 63220e7868 am: b6887951bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22894946
Change-Id: I9eef6e40af2a0f9f2922fd10c91e0b3e754a639d
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