summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author AndrĂ¡s Kurucz <kurucz@google.com> 2023-05-04 15:08:31 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-04 15:08:31 +0000
commit3c9dcedfb859c2c372c911073facf7695ae7bd46 (patch)
tree7580bdf1e430155969758ca08c6a567a665dba66 /libs/androidfw/StringPool.cpp
parentca4df7b9eb50d974c02102a80c0ee8efc6a4f279 (diff)
parentb575efcc0b49e591a84706fe14c239054e94d577 (diff)
[automerger skipped] Truncate ShortcutInfo Id am: d35e2ef67c -s ours am: a3edfb8f6b -s ours am: b575efcc0b -s ours
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 fee62a33da is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22907731 Change-Id: I11a32af60c6924c80e5ad35f3d05eccf0afb3793 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