diff options
| author | 2022-10-28 07:25:30 +0000 | |
|---|---|---|
| committer | 2022-10-28 07:25:30 +0000 | |
| commit | 97473dc3d986ade2ad1691501f86b51e9b73ef83 (patch) | |
| tree | e0ef725f3a0fd0076c5e178bdde4ae2437eea937 /libs/androidfw/AssetsProvider.cpp | |
| parent | 313e278ca5683bf2071e47a50d020c3e61ddf1cc (diff) | |
| parent | 29e2ce4c639ed02cf99c5435c275eb632d9fb51f (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" into qt-dev am: 191036a989 am: 70536c0199 -s ours am: bdf427e3a0 -s ours am: b4b3e02753 -s ours am: e7ab5c3f24 -s ours am: 1d806d66fe -s ours am: b7356c1c84 -s ours am: 84ead264f8 -s ours am: 29e2ce4c63 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20223219
Change-Id: Iee16f089e91ec025e1ecb33dbbab6189eabfce40
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