diff options
| author | 2022-12-08 05:30:20 +0000 | |
|---|---|---|
| committer | 2022-12-08 05:30:20 +0000 | |
| commit | d08ea21f46e0d6270cc966cb694681482af83905 (patch) | |
| tree | 1b9271b6091ed76ca4ec1b90e3fa8780d7a536f0 /libs/androidfw/StringPool.cpp | |
| parent | f3b8521bd1acea17bfada48d5daac6408c77b858 (diff) | |
| parent | 1bf12f380fde3fbc3fffd4372c3bf0f2a67da942 (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 am: 1bf12f380f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20671668
Change-Id: I128c7a167b4dab0da9d714aeb0689081ee0427e4
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