summaryrefslogtreecommitdiff
path: root/libs/androidfw/misc.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-09 02:58:45 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-09 02:58:45 +0000
commit7cbd60c0831ce729883f9e15289a8dcec19a9312 (patch)
treecdeeca7ce2e9a4a5c200c69f86d347a1f0574e12 /libs/androidfw/misc.cpp
parentb5faba4dd9af0f1459cb3eb45cecc57eb7f68735 (diff)
parenteeaf00b485c7ae4f4ed3fa5f86d5683483157532 (diff)
Merge "[automerger skipped] Merge "Truncate user data to a limit of 500 characters" into sc-v2-dev am: 240808177e am: fe790c6685 am: 9ab9f1c425 -s ours am: c652a4e525 -s ours am: 75268507ad -s ours am: bb23c47240 -s ours" into udc-qpr-dev-plus-aosp am: eeaf00b485 -s ours
am skip reason: Merged-In I633dc10974a64ef2abd07e67ff2d209847129989 with SHA-1 59042a32c7 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24664788 Change-Id: Ib753c11b740cc90f22008e6814b47e9174f83c75 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/misc.cpp')
0 files changed, 0 insertions, 0 deletions