diff options
| author | 2022-12-08 05:07:23 +0000 | |
|---|---|---|
| committer | 2022-12-08 05:07:23 +0000 | |
| commit | 1bf12f380fde3fbc3fffd4372c3bf0f2a67da942 (patch) | |
| tree | a69f931aa356588b6d59a544bab5653091f93d79 /libs/androidfw/StringPool.cpp | |
| parent | 36e0097bb4da34b6bd491405b00056214517baee (diff) | |
| parent | 69042ba58f837dc32ad0289e0c53c8c20f5c7d10 (diff) | |
[conflict] Merge "Implement a global maximum on number of shortcuts an app can publish" into rvc-dev am: 584d18790a am: f9a6a136a0 am: bb4ff2e484 am: eee3312ac2 am: 4611aa5717 am: 69042ba58f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20671668
Change-Id: I876efc00a31f2edee1f6ea384806acf5f31a3b02
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