diff options
| author | 2022-10-28 09:06:03 +0000 | |
|---|---|---|
| committer | 2022-10-28 09:06:03 +0000 | |
| commit | 25929efc7171e292358f0cb6e065f6ed52694b44 (patch) | |
| tree | 03dd6dd63af3c5b9cef5357b1a2662179ebd2add /libs/androidfw/StringPool.cpp | |
| parent | 4fd1ab169cd79ee743fb4dde0f14379acd2c794f (diff) | |
| parent | 1d767e38c4962dcf513e187bb03665aaf236c2f3 (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: d830baa11c -s ours am: f159e43b09 -s ours am: 1d767e38c4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20223219
Change-Id: I48c1fa75eb2b9802be4954138725939f1d6baeb4
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