diff options
| author | 2023-05-04 15:10:32 +0000 | |
|---|---|---|
| committer | 2023-05-04 15:10:32 +0000 | |
| commit | 98f823be69108712388d14f5f4033eba3c2d6e7c (patch) | |
| tree | 7580bdf1e430155969758ca08c6a567a665dba66 /libs/androidfw/StringPool.cpp | |
| parent | d452934ef02a96740a773a278531b40afd48f27c (diff) | |
| parent | bb8846f2ad8748138664bb97c3333768575a9185 (diff) | |
[automerger skipped] Truncate ShortcutInfo Id am: 6a278c3998 -s ours am: 947889f9d1 -s ours am: a06222a329 -s ours am: 4a654f9025 -s ours am: bb8846f2ad -s ours
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 ab0c8ac5b4 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22907464
Change-Id: If8372af712c21ef5aa4aaed1b3b36c30715890e1
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