diff options
| author | 2023-03-07 16:09:33 +0000 | |
|---|---|---|
| committer | 2023-03-07 16:09:33 +0000 | |
| commit | c1683e1bc0fc2af2fa671c7d13a73e13b37a64f1 (patch) | |
| tree | 03277a0c0a87cbb1634cd8f00e77c1ebe81a12d0 /libs/androidfw/StringPool.cpp | |
| parent | 71f840269a7c534304e46175b66334ab80abdf91 (diff) | |
| parent | b6aff4966112c5d047bd07e7f3097c89145d3b1f (diff) | |
[automerger skipped] Merge "Limit the number of shortcuts per app that can be retained by system" into rvc-dev am: 15ae228ddb am: 1d4b958078 -s ours am: b8f5a215f2 -s ours am: 0ffd1da0c3 -s ours am: b4cb7e1035 -s ours am: ea6c2789c2 -s ours am: b6aff49661 -s ours
am skip reason: Merged-In I001c7a87b62aefa9487bf8efaf3cd02d7cb21521 with SHA-1 94437e989c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21564438
Change-Id: I1eab6d2ed9edd74176e3c74a864ea26de839876a
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