diff options
| author | 2022-12-21 03:34:23 +0000 | |
|---|---|---|
| committer | 2022-12-21 03:34:23 +0000 | |
| commit | f529752f5345b585ea4d0d3470e2ceb0b8dbc84d (patch) | |
| tree | 85bcc3efaa2378de1751e93d8c29d0d7504728e8 /libs/androidfw/StringPool.cpp | |
| parent | b9b5e4c092f2608fb600c572feb3f5b0200f3e81 (diff) | |
| parent | 7e2ee156cf8313f46b6003878fab5059cfa94adf (diff) | |
[automerger skipped] Merge "[Do Not Merge] Revert "Implement a global maximum on number of shortcuts an app can publish"" into rvc-dev am: 28dae0e4c9 am: cf3f62c4c9 -s ours am: 7a31586c29 -s ours am: 15dbdb2a73 -s ours am: 7e1bf5b798 -s ours am: 85671779f6 -s ours am: fd017d9edd -s ours am: a159635443 -s ours am: 7e2ee156cf -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20750216
Change-Id: Ie92817144a5dc80a42ed217276fb1c29694bd31d
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