diff options
| author | 2022-10-27 22:08:03 +0000 | |
|---|---|---|
| committer | 2022-10-27 22:08:03 +0000 | |
| commit | 439ee4c4acf38daa75d7cc33b7aa05dd643186da (patch) | |
| tree | 85a1867b25a81775ead9b821ae870ea4c1841c67 /libs/androidfw/StringPool.cpp | |
| parent | f338087419e811ff8b2d301f68c3437d8875cd11 (diff) | |
| parent | 258c6ee4c276775e1e8475a34e76654de9851f71 (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" into rvc-dev am: 8038ab1477 am: e8f11f8960 -s ours am: 911725a3ee -s ours am: e3a5eed1d8 -s ours am: 9810b6ef91 -s ours am: fa32a51868 -s ours am: 2d162e19dd -s ours am: b87dec370b -s ours am: 258c6ee4c2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20235229
Change-Id: I70abe3616b4fe229a3c1d3c2280336755ac24c66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions